All other files
Merge branch 'master' of https://github.com/Marika3/SlidifyTest

Conflicts:
	README.md