Just all kinds of changes
added support for demo mode
Merge pull request #144 from devinlynch/John-April7-15

John april7 15