add json and oauth gems
log change
Merge branch 'master' of github.com:dereksilverman/Future.me

Conflicts:
	log/development.log
modify gitignore
change gitignore again