working on the line
Merge branch 'master' of https://github.com/bah-interactivemedia/ReInventNASA2014
States etc.
more line stuff
Merge branch 'master' of https://github.com/bah-interactivemedia/ReInventNASA2014

Conflicts:
	Client/Assets/Prefabs/ImageView.prefab
	Client/Assets/Scripts/GameController.cs
Merging