Removed ConvexShapeEditor
Old projectGenerator now with 100% more working
Updated ignores
Chmod +x, not sure how much this is actually doing but it makes git shut up
Merge branch 'master' of https://github.com/JeffProgrammer/BeyondReality

Conflicts:
	My Projects/Marble/game/game/client/prefs.cs