Initial commit
Initial commit
Fixed conlicts

Merge branch 'master' of github.com:topaz2/boilerplate

Conflicts:
	.gitignore
	README.md