this shouldn't be commited
Merge branch 'master' of https://github.com/Kurtole1/Hipstars