working
Merge branch 'page' into dashboard

Conflicts:
	src/scripts/components/FlashDashApp.jsx
	src/scripts/components/HelloWorld.jsx
	src/scripts/components/main.jsx
got most of it there

mostly just need to put in some icons