Fix gitignore
Merge branch 'master' of https://github.com/martinstanojevic/Starter

Conflicts:
	.gitignore
	app/scripts/main.js
	app/styles/main.scss
Fix script tags position.