Merge branch 'master' into asset-pipeline

Conflicts:
	static/js/application.js

templates/main.html

@@ -43,7 +43,7 @@
     <p> Copyright &copy; 2012. MIT. <a href="/t/copyright.html">Some rights reserved.</a>
 </p>
       <nav>
-      <ul class="social">
+      <ul aria-label="Social Links" class="social">
         <li class="linkedin">
           <a href="http://www.linkedin.com/groups/Friends-Alumni-MITx-4316538">Linked In</a>
         </li>
@@ -57,7 +57,7 @@
     <ul>
       <li><a href="#feedback_div" rel="leanModal">Feedback</a></li>
       <li class="calc-main">
-        <a href="#" class="calc">Calculator</a>
+        <a aria-label="Open Calculator" href="#" class="calc">Calculator</a>
 
         <div id="calculator_wrapper">
           <form id="calculator">