Test
Merge branch 'master' of https://github.com/pauliustumosa/SF-Taupkase

Conflicts:
	.gitignore