changed gitignore
Merge branch 'develop' into taylor
12/3/14 committing before pulling develop
Merge branch 'develop' into taylor
12/4/14 bugfix + displaying modules when inside
12/4/2014 Everything work
12/4/14 everything works again
Merge branch 'taylor' into patrick

Conflicts:
	Homeward/Assets/Scripts/PlayerController/PlayerController.cs