first CSS styles - login page
first CSS styles - moar
update
fake dashboard
update
fix conflicts
Group index page showing all groups and groups made by logged in user
add check in route
added badges demo page
merge
fix checkin link on map callout
dash styling
Merge branch 'dev-aaron'
merge aaron branch
groups update
merge
groups local commit
groups update
fix merge errors
hows this working
'updateing'
Merge branch 'master' of https://github.com/richmondwatkins/quest4change

Conflicts:
	app/static/js/es6/maps.es6.js