html and style changes
Merge branch 'master' of github.com:chad-m/a13-swamp-rabbit

Conflicts:
	app/scripts/main.js
misc changes
intial commit
Merge branch 'master' of github.com:chad-m/a13-swamp-rabbit
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
Merge branch 'master' of github.com:chad-m/a13-swamp-rabbit

Conflicts:
	app/scripts/main.js
modified map; custom icon; resize event
Merge pull request #9 from MC3D/mchapman

modified map; custom icon; resize event
misc changes
Merge branch 'master' of github.com:chad-m/a13-swamp-rabbit

Conflicts:
	app/index.html
Info section added and map icon updated
Tweaks to the styling and Tablet re-sizing
Final tweaks to styling and re-sizing
Merge pull request #10 from Jeff-Coons/Updated-Styling

Info section added and map icon updated
Merge branch 'master' of github.com:chad-m/a13-swamp-rabbit
build