Minor edits
Merge branch 'master' of https://github.com/mananshah99/spaceasteroids

Conflicts:
	.DS_Store
	SpaceAsteroids/SubViewController.m
	SpaceAsteroids/SubViewController.xib