initial commit
Merge branch 'master' of github.com:michaelcolenso/drunken-hipster

* 'master' of github.com:michaelcolenso/drunken-hipster:
  Initial commit