Changes
Merge branch 'master' of https://github.com/ChrisTrantas/2014_RIT_ImagineCup

Conflicts:
	RIT 2014 Imagine Cup Unity Project/Assets/Scripts/Elevator.cs.meta
	RIT 2014 Imagine Cup Unity Project/Assets/Textures/Thumbs.db.meta
	RIT 2014 Imagine Cup Unity Project/RIT 2014 Imagine Cup Unity Project-csharp.sln
	RIT 2014 Imagine Cup Unity Project/RIT 2014 Imagine Cup Unity Project.sln
	RIT 2014 Imagine Cup Unity Project/RIT 2014 Imagine Cup Unity Project.userprefs