working on count me in
Merge branch 'master' of https://github.com/DavidSpriggs/hackathon_2-18-2014

Conflicts:
	views/activities/addPlan/index.jade
addplan
Merge branch 'master' of https://github.com/DavidSpriggs/hackathon_2-18-2014
merge