Initial commit UI branch
Merge with Logic branch
Merge branch 'UI_branch'

Conflicts:
tick	app/index.html
tick	app/views/main.html