Install JS-Routes gem
Incorporate javascript
prepare for pull
Merge
merge
Install 'thin' and 'log_buddy gems, and updated db to include seed profiles, statuses, friendships