initial commit
fixed merge conflict
Merge branch 'master' of https://github.com/roberttaraya/craigslist_jr_rails