home changes
Merge branch 'master' of github.com:halhenke/doctor

Conflicts:
	Ruby Rails notes & tips.org