fixed the overlap problem
Merge branch 'master' of https://github.com/deviozc/taskManager-client

Conflicts:
	app/styles/main.scss