conflict new users
removed alert box feel free css and js mixed up feel free to edit
UI with pictures ver 1.1
CSV functionality is a go. Link to /Users/csv. I also added a test to make sure sessions persist over links to other pages.
Merged csv update with master.
Slides are up and runnng
Merge branch 'master' of git://github.com/Silenthillnight/cs169
Fixed bug in homepage
Pull from master after modified waitlist features.
1. Added more tests for registration association controller