Brainstorming about names
Steven updated the sloop art
changed author to be correct
Merge branch 'master' into develop

Conflicts:
	.idea/workspace.xml
	art/exported/laser.png
	art/exported/sloop.png
	art/laser.svg
	art/sloop.svg
	assets/assets.png
Merge branch 'steven' into develop