compiled es6 files included in commit
couch potato badge added
Merge branch 'aaron-dev' into nathan-dev
Merge branch 'richmond-dev' into nathan-dev
Merge branch 'richmond-dev' into nathan-dev
Merge branch 'aaron-dev' into nathan-dev
Merge branch 'richmond-dev' into nathan-dev
README started, sockets stripped from project directory
update high-res badges and profile icons
updated readme
Merge branch 'nathan-dev'

Conflicts:
	app/models/user.js
	app/static/js/es6/compiled/create-group.js
	app/static/js/es6/compiled/create-quest-add-locations.js
	app/static/js/es6/compiled/create-quest.js
	app/static/js/es6/compiled/dashboard.js
	app/static/js/es6/compiled/edit-group.js
	app/static/js/es6/compiled/edit-quest.js
	app/static/js/es6/compiled/leaders.js
	app/static/js/es6/compiled/location-details.js
	app/static/js/es6/compiled/locations.js
	app/static/js/es6/compiled/main.js
	app/static/js/es6/compiled/profile.js
	app/static/js/es6/compiled/show-quest.js
Merge branch 'aaron-dev' into nathan-dev
Merge branch 'nathan-dev'
added register unit test
refactored user creation without multiparty

* no more photo upload on account creation. eliminated the need for multiparty
* updated User.register, constructor, register route and user_spec test file
Merge pull request #2 from nathanhood/unit-test-user

added register unit test
unit-test-user-findByEmail
ZZ
adding tests for findById
cleaned up some indenting stuff
unit-test-user-findByUserName