Linked dashboard.html to plan.html
Merge remote-tracking branch 'origin/master'

Screw conflicts. My beautiful baby!
Conflicts:
	css/planner.css
	dashboard.html