Initial commit
Merge branch 'master' of https://github.com/kristina-hager/SwiftProject

Conflicts:
	.gitignore