Polymer support added
Merge branch 'master' of github.com:RenderTeam/focus

Conflicts:
	public/js/app.min.js
Merge branch 'Diego' of github.com:RenderTeam/focus

Conflicts:
	package.json
	public/js/app.min.js
:) Angular timer support done right
Removed file tracking
:)