play bongos on mars
Merge branch 'master' of https://github.com/mickmau5/planets

decided to smoke reefer AND play bongos

Conflicts:
	mars.txt