Updated .gitignore to not upload IDE project folder
Merge remote-tracking branch 'origin/master'