get work
Merge branch 'master' of https://github.com/deshannalinda/enrol_planner

Conflicts:
	app/views/planner/index.html.erb