Merge branch 'master' of heroku.com:shrouded-sands-7715

Conflicts:
	webpages/wallabee.html
update constants
Merge branch 'master' of heroku.com:shrouded-sands-7715

Conflicts:
	webpages/wallabee.html
updates
updates
updates
updates
update
update
Merge branch 'master' of heroku.com:shrouded-sands-7715

Conflicts:
	apis/wallabee.js
updates
updates
Merge branch 'master' of heroku.com:shrouded-sands-7715
Merge branch 'master' of heroku.com:shrouded-sands-7715
Merge branch 'master' of heroku.com:shrouded-sands-7715
Merge branch 'master' of heroku.com:shrouded-sands-7715
Merge branch 'master' of heroku.com:shrouded-sands-7715
Merge branch 'master' of heroku.com:shrouded-sands-7715
Merge branch 'master' of heroku.com:shrouded-sands-7715
Merge branch 'master' of heroku.com:shrouded-sands-7715
Merge branch 'master' of heroku.com:shrouded-sands-7715