intial commit
Merge branch 'master' of github.com:chad-m/a13-swamp-rabbit into mchapman

Conflicts:
	app/index.html
	app/styles/main.scss
Merge pull request #7 from MC3D/mchapman

added map