Add CSS fixes
Merge branch 'master' into additions

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

Add CSS fixes