new [ickles
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.js
Merge branch 'master' of https://github.com/RBazelais/Boss-Up

Conflicts:
	main.js