Made temporary student listing
Added temporary route for student list
Merge branch 'seeds' of github.com:codeforamerica/ticket-to-ride into student_list
Added Devise and Active Admin for authentication and for initial sys admin screens (eventually replaced with cleaner tech director view)
Merge pull request #12 from codeforamerica/auth

Don't pass[word] me by... (or Added authentication and temporary admin interface)
Merge branch 'master' into student_list
added train backgrounds
Added temporary logo
Revert "Added Devise and Active Admin for authentication and for initial sys admin screens (eventually replaced with cleaner tech director view)"
Removed initial authentication commits

This reverts commit 9751246fe69e1d7366945f27303112aa2e260018.
Revert "Merge branch 'seeds' of github.com:codeforamerica/ticket-to-ride into student_list"
Reverting
This reverts commit 9f5fb82040d09bc60eba25feba8696ea42bce7d8, reversing
changes made to 7f39edd5c0b3efa6a65ceeaa63a5c2136eb4d133.
Removed DS_Store from intial authentication commits
Merge pull request #14 from codeforamerica/lookandfeel

We can work it out - aka adding initial backgrounds for welcome page #2
Merge commit '302adbf56b6cb0487b5fe840a53981367107596d' into auth

* commit '302adbf56b6cb0487b5fe840a53981367107596d':
  Removed DS_Store from intial authentication commits
  Revert "Merge branch 'seeds' of github.com:codeforamerica/ticket-to-ride into student_list" Reverting This reverts commit 9f5fb82040d09bc60eba25feba8696ea42bce7d8, reversing changes made to 7f39edd5c0b3efa6a65ceeaa63a5c2136eb4d133.
  Revert "Added Devise and Active Admin for authentication and for initial sys admin screens (eventually replaced with cleaner tech director view)" Removed initial authentication commits
  Added temporary logo
  added train backgrounds
  Added Devise and Active Admin for authentication and for initial sys admin screens (eventually replaced with cleaner tech director view)
  Added temporary route for student list
  Made temporary student listing

Conflicts:
	app/views/layouts/application.html.erb
Updated schema (after running rake db:migrate)