trying to create markers
Merge branch 'master' of https://github.com/thebrilliant/traffic-cam-challenge

Conflicts:
	js/app.js