Part of shopping
Merge branch 'master' of github.com:SpaceCatLabs/ascii-elite

Conflicts:
	ascii_elite.rb