initial commit
Merge commit '1379fd8a715f9a1239b134d285330fc5b914b42c'

Conflicts:
	.gitignore