first commit
Merge branch 'master' of https://github.com/tofuninjah/first-bloc-app

Conflicts:
	.gitignore