added 10 hours cantina song
Merge pull request #3 from Bonko/master

added 10 hours cantina song
Merge remote-tracking branch 'upstream/master' into megaman

Conflicts:
	Standupfile