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
Add code field to languages table for api call
Remove field from languages table migration file
Add methods for bing API call
Merge pull request #40 from stellajkimm/styling

Styling
Add migration for code to lanugages table, add files to gitignore
Add text for debugging - removed it for this commit
Add text for debugging - removed it for this commit
Modified to test out bing api but now back to as it was before
Add routes for bing API page and create bing page
Add code to language seeds
Add factorygirl call but commented out for testing of test
Add file to gitginore list
Add api model for bing api
Add bing form partial
Add bing form page