Initial commit
Merge commit 'd854ef459419e6e778c88fe634f90e68aadf957c'

Conflicts:
	.gitignore