Merge branch 'master' of https://github.com/choiks14/webapp-assemble

Conflicts:
	.gitignore
	README.md