Update to ruby 2.0 / rails 3.2.13
Merge branch 'master' of https://github.com/touma/competence

Conflicts:
	Gemfile.lock
Update to ruby 2.0 / rails 3.2.13