Merge branch 'development' of github.com:ASCTech/mooculus into develo…

…pment

Conflicts:
	public/textbook/mooculus-print.pdf
	public/textbook/mooculus.pdf

app/views/handouts/index.html.erb

@@ -15,7 +15,11 @@ expression, <strong>sketch</strong> each graph,
 and <strong>think</strong>&mdash;always think!&mdash;about just what
 you are doing. You should work examples and fill in the details.  Like
 all great things, this is no easy task.</p>
+
+<p>This book is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike license</a>.  If you'd like to contribute, please <a href="https://github.com/ASCTech/mooculus/tree/master/public/textbook">see the textbook GitHub page</a>.</p>
+
 <p>You can begin reading now by <a href="/textbook/mooculus.pdf">downloading the textbook</a>.</p>
+
           </div>
         </div>
         <div class="span5">

app/views/layouts/application.html.erb

@@ -66,7 +66,7 @@
     <hr>
 
     <footer>
-      <p>&copy; <%= Date.today.strftime( '%Y' ) %>, <a href="/developers"><%=raw html_logo %> team</a>.  <a href="/contact">Contact us</a>.
+      <p>&copy; <%= Date.today.strftime( '%Y' ) %>, <a href="/developers"><%=raw html_logo %> team</a>.  <a href="/contact">Contact us</a>.</p><p><a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-sa/4.0/80x15.png" /> All content licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.</p>
     </footer>
   </div> <!-- /container -->