added starting round page, fixed sign in
fixed merge conflicts
removed name from tests
Fixed model tests and passed them
Merge branch 'master' of https://github.com/cicadas-2014/BJR
Merge pull request #20 from LasseSviland/master

Updated login page
Fixed merge conflict in factories
Merge pull request #21 from kz363/master

Model tests
removed name form new user
Merge pull request #22 from LasseSviland/master

removed name form new user
more ignore