学习笔记
Merge branch 'master' of github.com:wjp2013/the_room_of_exercises

Conflicts:
	读书笔记/codecademy_ruby.md