Merge branch 'gh-pages'
added open map
setup bower
added route
commit
commit
added cities
commit
commit
commit
commit
commit
Merge branch 'master' into gh-pages
commit
commit
commit
commit
attempting to add routes

i broke it
still broke
Merge branch 'master' into gh-pages

Conflicts:
	config.codekit