updated rvmrc to fixed the ruby version
Merge branch 'master' of github.com:brtr/mvp
added unicorn configuration for development
modify home#index
#12 generate active_admin
#12 update with sign_in and sign_up style
modifty home#index 2
#12 update with password edit and option menu
fix the bug of fontello's fonts
#12 delete dropdown.js while to add bootstrap
finish home#index
Merge branch 'master' of github.com:brtr/mvp

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

modify home#index
Merge branch 'master' of https://github.com/xiongbo/mvp

Conflicts:
	app/views/home/index.html.haml
	app/views/layouts/_header.html.haml