Initial commit
Merge branch 'master' of https://github.com/halldorel/slembifrettir

Conflicts:
	.gitignore