Stashing some things
Merge branch 'master' of github.com:NinjaBranDizzle/demo