Blue Monkeys
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/index.html
Merge pull request #3 from JayWIlsonJr/master

Blue Monkeys