changed flashes to reflect team join status
FIXME/TODOs removed
We discussed these and determined the current status to be OK
Merge branch 'develop' of github.com:PurdueHackers/hackathon into develop
updated some team logic to consolidate things
Merge branch 'develop' of github.com:PurdueHackers/hackathon into develop