cucucumber spork
checking conf
fixing conf
signin page updated
Test for whether there will be merge conflit with a pull after
modifying the router.rb file
Merge branch 'master' of github.com:Silenthillnight/cs169
After pulling from git after changing the router.rb file
Model v1.0 done. Pull from public and start to wrok
on Registrations_controller