may have messed up branch after using stach
update gitignore
gitignore update 2
removed .idea files
Merge pull request #1 from Rennection/develop

Develop into Master