install devise. add tmp folder in ignore list
Merge branch 'master' of https://github.com/risinglf/startupbox-website

Conflicts:
	config/initializers/devise.rb