Merge pull request #125 from nolanfilter/Nolan

Incorporated start screen with controller
no message
Merge pull request #126 from nolanfilter/JimmyJam

no message