Added guardians of the galaxy
Merge branch 'master' of heroku.com:revuse into hot