clobering everything
Merge branch 'master' of https://github.com/minghz/civso

Conflicts:
	Gemfile.lock
	README.md
	app/views/home/index.html.erb
	config/database.yml
	log/development.log