Merged develop into master
Initial commit
Merge branch 'master-bitbucket'

Conflicts:
	.gitignore
Merge branch 'master' into develop