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

Conflicts:
	app/scripts/main.js
misc changes
Merge branch 'master' of github.com:chad-m/a13-swamp-rabbit
Merge branch 'master' of github.com:chad-m/a13-swamp-rabbit

Conflicts:
	app/scripts/main.js
misc changes
Merge branch 'master' of github.com:chad-m/a13-swamp-rabbit

Conflicts:
	app/index.html
Merge branch 'master' of github.com:chad-m/a13-swamp-rabbit
build