initial commit
Merge branch 'master' of github.com:temmel/sample-mag

Conflicts:
	.gitignore