resolving conflict
Functional Prototype Changes:

- Increased the weapon limits
- added shortcuts for menu and restart game (we need to remove this, they were just for testing purpose)
- adjusted obstacles
Merge branch 'master' of https://github.com/moleculeone/abugsgame

Conflicts:
	Assets/New Terrain 1.asset
	Assets/Scenes/Level1.unity