fucking unicorns
Merge branch 'master' of https://github.com/strivedi183/snippyskippy
added puma
Merge branch 'dev'