first commit
Merge branch 'master' of https://github.com/TJohnson93/Samantha-Boilerplate

Conflicts:
	README.md