css conflict??
??
???
Merge branch 'master' of github.com:vishwin/coffeestop
fixed style