dashboard mockup work
Merge branch 'master' into dashboard-mockup

Conflicts:
	public/css/martha.css
putting something on the dashboard
Merge pull request #16 from mrkrstphr/dashboard

putting something on the dashboard