Merge pull request #10 from alephtwo/master

ben's updates
pushing my changes
Merge branch 'master' of https://github.com/novoalg/cs485-1

Conflicts:
	config/routes.rb

:q
:Q:q
Fix navbar
Model Tests
Model Tests
Change seeds.rb
Merge
Fixed user inconsistencies
Merge pull request #13 from novoalg/master

mailer
Merge pull request #11 from alephtwo/master

Ben fixed signup
:q
Merge branch 'master' of https://github.com/novoalg/cs485-1

:q
Merge branch 'kubicect'
Changed from notice to alert
Converted to cucumber
Finished mailer model and mass email feature
Merge branch 'delebota'
Merged