Added bullet and enemy collision
Merge branch 'master' of https://github.com/kangareuben/nanoshot

Conflicts:
	Nanoshot/Assets/Placeholder art/Enemy 2.png.meta
	Nanoshot/Assets/Placeholder art/Player Bullet.png.meta