Added stuff
Merge branch 'master' of https://github.com/germzr/HackTX2014

Conflicts:
	hackTX14/Assets/JSON Files/Calendar.json.meta
	hackTX14/hackTX14-csharp.sln
	hackTX14/hackTX14.sln
	hackTX14/hackTX14.userprefs