changes to gemfile
changes merged
added twitter auth
trying again
reformatted HomepagesController;  committing b4 pull