4
Merge branch 'master' of https://github.com/bmcool/test

Conflicts:
	.gitignore

hmm