Added .idea folder to gitignore
Merge branch 'master' of github.com:c316/give