right-text & left-text align
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/dist/css/main.css
	css/main.css
Merge remote-tracking branch 'origin/master'