by by crap unix and visual projects
bye bye crap
Merge branch 'master' of https://github.com/buhny/She-lium

Conflicts:
	.gitignore