Merge branch 'master' into cleanup

* master:
  Add years to signup birthdate.  Fixes #67
  Update test for navigation links
  Removed lol_nothing links.  Fixes #66
  Fix spacing

app/views/devise/registrations/new.html.haml

@@ -25,7 +25,7 @@
         %br/
         %label
           When were you born?
-        = date_select :user, :birthdate
+        = date_select :user, :birthdate, start_year: 75.years.ago.year
         %em
           If you are less than 13 years old, you must have you parent's permission, and use your parent's email address.
 

app/views/pages/_navigation.html.erb

@@ -8,10 +8,7 @@
     <tbody>
         <tr> <td><a href="/"> Home </td></a></tr>
     	<tr> <td><a href= <%='/users/'+ current_user.id.to_s%> > Profile </td></a></tr>
-    	<tr> <td><a href="lol_nothing"> Projects </td></a></td></tr>
-    	<tr> <td><a href="lol_nothing"> Courses </td></a></tr>
-    	<tr> <td><a href="lol_nothing"> Assignments </td></a></td></tr>
-        <tr> <td><a href="lol_nothing"> (Announcements) </td></a></td></tr>
-    	<tr> <td><a href="lol_nothing"> (Collaborators) </td></a></td></tr>
+    	<tr> <td><a href="/projects"> Projects </td></a></td></tr>
+    	<tr> <td><a href="/courses"> Courses </td></a></tr>
     </tbody>
 </table>

features/prettyurl.feature

@@ -0,0 +1,18 @@
+Feature: Project Submission
+    As a student
+    So that I can complete assignments
+    I should be able to submit projects for an assignment
+
+    As a teacher
+    So that I can grade students
+    I should be able to see projects they've submitted
+
+Background:
+
+    Given the following users exist:
+    |id | username | email | password | password_confirmation |
+    | 300 | beatrice | beatrice@cal.edu | password | password |
+
+Scenario: Browse to the pretty url
+    When I go to the url "/@/beatrice"
+    Then I should be on the profile page of "beatrice"

features/step_definitions/dashboard.rb

@@ -62,7 +62,4 @@
   page.should have_content "Profile"
   page.should have_content "Projects"
   page.should have_content "Courses"
-  page.should have_content "Assignments"
-  page.should have_content "Announcements"
-  page.should have_content "Collaborators"
 end