Fixed merge conflicts
Merge branch 'master' of https://github.com/HackerParadise2014/mustached-octo-meme into HEAD
Added versions