Updated README
Updated README
Merge branch 'work'

Fixed conflicts:
	README.md
	README.md~
added ignores
deleted accedentally committed file