commit
Merge branch 'master' of github.com:jhjang/pom

Conflicts:
	Gemfile.lock
	config/database.yml