Major overhaul with the addition of demo views
Merge branch 'master' of github.com:justinsisley/Mercenary