color
Merge branch 'master' of https://github.com/mainliner/frontendforbuilding

Conflicts:
	resources/css/style.css