Renamed files that do not have .cs extension
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Assets/Scripts/InvisResource.cs
	Assets/Scripts/PlayerMovement.cs
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Assets/_Scenes/Scene2.unity
Making version control work
Changing button color based on state
Merge pull request #4 from shiyingzheng/master

New Scripts for Weapon Select Menu, Mouse Movement, etc