Update 7 - Obstacle Class

-Obstacle Class
-Moved player location down
Fixing Merge Errors
Merge branch 'master' of https://github.com/FermentedRumptz/Burrito

Conflicts:
	Burrito/Burrito/Game1.cs