Removed windows line endings added .idea/ to gitignore
Merge branch 'master' of https://github.com/DotYou/Socializr