last useless changes
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2014
added borders
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2014
added asteroids
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2014

Conflicts:
	Assets/Scripts/AsteroidManager.cs
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2014

Conflicts:
	Assets/Scenes/game.unity