Merge branch 'master' of https://github.com/Alsirik/myfirstgit

Conflicts:
	TreemFolder/style.css
Merge origin/master

Conflicts:
	TreemFolder/style.css