astroid shadow
Merge branch 'master' of https://github.com/bobby-vandiver/cs485-xna-final
Merge
Conflicts:
	FinalProject/FinalProject/FinalProject/Levels/Planet/Bombard/Bombard.cs
	FinalProject/FinalProject/FinalProjectContent/FinalProjectContent.contentproj
Merge issue.