Changed order of loading css files
Merge branch 'master' of github.com:faizalzakaria/dash_app

Conflicts:
	app/views/landing_pages/pickup.html.erb