line-up
Merge branch 'master' of https://github.com/MySmallfish/WallaShops

Conflicts:
	app/js/app.js
	index.html