Update .gitignore
Remove Codeblocks user files
Normalize
Merge remote-tracking branch 'origin/dev'
Update .gitignore
Merge pull request #8 from Ponykart/master

Merge