setup staging for heroku
fix broken test
Merge pull request #136 from Hendrixer/db

set up heroku stuff, change schema
fixed the shadow on the topbar dropping into the header bar
created a groups view
adds app.styl
Deleted original app.css
stylus grunt task started
added group service and a template for it
Merge pull request #147 from Mayho/stylus

adds app.styl
add password reset close #142
Merge branch 'staging' of https://github.com/Fittr/fittr into db
update pachage json
Merge pull request #148 from Hendrixer/db

Add forgot pass word feature
Mehul's .styl and my groups controllers
Merge pull request #149 from sudostack/groups

Groups
Merge branch 'staging' of https://github.com/Fittr/fittr

Conflicts:
	app/coffee/test/users_spec.coffee
Merge pull request #151 from pieteradejong/master

added group model with basic crud tests
added draft for competition schema