first commit WIP
Merge branch 'master' of github.com:djhi/my-meteor-boilerplate

Conflicts:
	.gitignore