Minor update style.css
Minor update app.js
Merge https://github.com/maccana/Angular-Template

Conflicts:
	app/app.js
Cleaned app.js