changed js
Merge branch 'master' of github.com:chad-m/swamp-rabbit-test

Conflicts:
	app/scripts/main.js