Merge branch 'thomas'
styling
merge conflict
styling. and the main.css word toch niet geignored :/
spinnerz
alignment and removed scan, readded blueorb :/
ng-show detail view
Merge branch 'thomas'

Conflicts:
	app/index.html
	app/styles/fonts.css
	app/styles/main.css
	app/styles/main.scss
	app/views/overview.html
Update .gitignore
Scan view styling