changing some things, fixing gitignore

more to come
Merge branch 'master' of https://github.com/Prokow01/potential-octo-ninja

Conflicts:
	README.md