Aloha commit + New Logo

Added Aloha files and added a new logo.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Flymu/index.html