some css changes
Merge branch 'master' of github.com:jenfan/lamps

Conflicts:
	config/database.yml