update
update
fix conflicts
add check in link
Group index page showing all groups and groups made by logged in user
add custom map icon code
Merge branch 'dev-aaron'
merge aaron branch
groups update
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
header search styling
'added searchResults routes and jade'
login to dash
fixed user model conflict
groups styling