refactor views
refactor views
Merge branch 'master' of github.com:leonko/stm
Merge branch 'master' of heroku.com:simple-task-manager

Conflicts:
	Gemfile.lock
heroku asserts fix