commit to github again2
Merge branch 'master' of https://github.com/RajBasu/NYU_Summer2014_FinalProject into erica

Conflicts:
	FINAL.userprefs
	Library/assetDatabase3
	Library/guidmapper
	Temp/UnityTempFile-47b5098773d8e4b668cb53d67a4d83d0
	Temp/__EditModeScene
Merge pull request #1 from RajBasu/erica

Erica