Added some things from the manual (see hints.txt)
don't want to track gems
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile
	Gemfile.lock