Merge branch 'develop'
Merge branch 'master' of https://github.com/WikiLogic/WikiLogic
commiting gitignore to master branch as well -scared to merge develop branch