Comment out merge conflict marks, add parentheses
Merge branch 'master' into translate-API
Merge branch 'master' into translate-API
Merge with upstream master
Merge with master
set up queries controller spec
Add code field to languages table for api call
Remove field from languages table migration file
added styling to language index page with masonry
clean up styling with css.. added timestamp to queries view in languages page.
created another button for bing translation form
changed header to make buttons on the side of flag
create queries spec
Fixed seed file. Drop and recreate your databases.
Add methods for bing API call
Merge branch 'master' of https://github.com/red-spotted-newts-2014/translateYo into styling
Merge pull request #39 from hilarybarr/seed

Fixed seed file. Drop and recreate your databases.
Merge branch 'master' of https://github.com/red-spotted-newts-2014/translateYo into styling
Merge pull request #40 from stellajkimm/styling

Styling
Add migration for code to lanugages table, add files to gitignore