added .idea folder to the git ignore
Merge branch 'dev' of github.com:Label305/Label305.com into dev