Frist commit
Merge commit 'eb53395bf508188c39af2a7ade544eac597d3a08'

Conflicts:
	.gitignore