Initial commit
Fix merge
Merge branch 'master' of https://github.com/c0smic/LuckyCritic