OKay...
:
Merge branch 'master' of github.com:MooNDeaR/just-for-test

Conflicts:
	NEW

Hell