Removed workspace.xml
Merge branch 'master' of https://github.com/artog/intro-prog.git

Conflicts:
	Shorevival/.idea/workspace.xml
Fixed bullet angle