Initial commit
Merge branch 'master' of git@github.com:whatbi/base.git

Conflicts:
	.gitignore
commit gitgnore
setting files