first Commit
Merge branch 'master' of https://github.com/dogredwing1/-flaming-hipster