css remaster
Merge branch 'master' of https://github.com/vishwin/coffeestop

Conflicts:
	.DS_Store