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

Conflicts:
	.gitignore
added staff for https://travis-ci.org
Merge branch 'master' into develop