Added tiny shop, merged code
Merge branch 'master' of https://github.com/gorerider/webAppSeba

Conflicts:
	app/views/Login/index.html
	app/views/Login/register.html
	app/views/main.html
	conf/routes