project set up
Merge branch 'master' of https://github.com/mkitzman/fe-dash

Conflicts:
	README.md