Changed hex styles and user layout
Merge branch 'master' into styles

Conflicts:
	app/views/users/show.html.erb
Merge pull request #49 from aphuong/styles

Changed hex styles and user layout