Merge branch 'master' of https://github.com/donald93/presidential_rumble

Conflicts:
	Presidential Rumble/Assets/Scenes/Main.unity
	Presidential Rumble/Library/CurrentLayout.dwlt
	Presidential Rumble/Library/assetDatabase3
	Presidential Rumble/Library/guidmapper
	Presidential Rumble/Presidential Rumble-csharp.sln
	Presidential Rumble/Presidential Rumble.sln
	Presidential Rumble/Presidential Rumble.userprefs