home Version
Merge branch 'master' of https://github.com/sanchja/slomag

Conflicts:
	images/background.jpg