Added player controller
Added teaching controller
Minor updates to scene layout
Merge pull request #1 from nolanfilter/Nolan

Prototype 1 from 02/11/14