#12 generate active_admin
#12 update with sign_in and sign_up style
updated rvmrc to fixed the ruby version
added unicorn configuration for development
#12 update with password edit and option menu
#12 delete dropdown.js while to add bootstrap
Merge branch 'master' of https://github.com/xiongbo/mvp

Conflicts:
	app/views/home/index.html.haml
	app/views/layouts/_header.html.haml
#10 remove purecss, add bootstrap, update home page
#10 update sign_up sign_in with bootstrap
Merge branch 'bootstrap' of github.com:brtr/mvp

Conflicts:
	app/views/home/index.html.haml
	app/views/layouts/_header.html.haml
Merge pull request #16 from caok/master

remove purecss, add bootstrap