Reorganized file structure
Merge branch 'master' of http://github.com/SteamLUG/steamlug-7dfps-2014

Conflicts:
	main_menu/main_menu.gd
	player/player.xscn