Merge branch 'master' of https://github.com/fa6ian/santander-build

Conflicts:
	assets/css/app.css
	index.html