rails lunch talk
added heroku cheatsheet
dev gems
Merge remote-tracking branch 'upstream/master'