Should've done this long ago
Merge branch 'master' of https://github.com/hogart/frontend-template

Conflicts:
	README.md