Progress made on styling mostly...

still having problems with touch devices
Merge branch 'Phil' of https://github.com/winners84/elc-template into Phil

Conflicts:
	app/scripts/main.js