Loader styling
Merge branch 'master' of github.com:TeamAlberto/AlbertoApp

Conflicts:
	app/styles/main.scss