nesting if statements in process photo user model and quest model
Merge branch 'aaron-dev' into richmond-dev
merging in aaron's styling
Merge branch 'nathan-dev' into richmond-dev
merging in Nathan's latest changes
Merge branch 'aaron-dev' into nathan-dev
added else if statement to findbymany in location model
fixed bug on photo uploads in user and quest models
Merge remote-tracking branch 'origin/richmond-dev' into nathan-dev
registration/login error messaging added
forgot password functionality added
calculating user points added/check for complete quest

* complete quest confirmation page added
* badges need to be incorporated next into scoring system
calculating user points and badge system added

* needs more troubleshooting
Merge branch 'nathan-dev' into aaron-dev

Conflicts:
	app/views/groups/create-group.jade
	app/views/groups/edit.jade
	app/views/groups/view.jade
	app/views/quests/create-quest.jade