Added templates for user flow
Merge branch 'master' of https://github.com/pcas00/productivity

Conflicts:
	application.py
Merge pull request #1 from svaleri11/master

Merge latest commits