tables and such populated
Merge branch 'master' of https://github.com/hrazith/-naviplan

Conflicts:
	_includes/create-plan1.html
	styles/collections/tables.css
	styles/naviplan.css