Merge pull request #47 from aphuong/styles

Styles
Add CSS styling

* add button events
* add three column format to admins userlist
Merge pull request #48 from aphuong/additions

Add CSS styling
Merge branch 'master' into styles

Conflicts:
	app/views/users/show.html.erb