init
init
Merge branch 'master' of https://github.com/Drathal/pimf-slidr

Conflicts:
	README.md