Merge pull request #7 from caok/master

add database.yml.example for mysql and modify gemfile
added link to category
Merge branch 'master' of github.com:brtr/mvp
updated rails to 4.1.0
add binding_of_caller
Merge branch 'master' of github.com:brtr/mvp

Conflicts:
	Gemfile.lock