Updated stuff
Pull!
Got rid of conflicts
Merge branch 'master' into dev
Added .idea to .gitignore