com
Merge branch 'master' of github.com:Leeron2010/sizeApp

Conflicts:
	app/source/assets/style.css
	app/source/views/start_screen/start_screen.html