First commit
Updated some controllers
Added json and typhoeus gems
Updated controllers and views