Comment out merge conflict marks, add parentheses
Merge branch 'master' into translate-API
Merge branch 'master' into translate-API
added features spec for footer and nav
Merge pull request #37 from fma2/comments-TDD

Comments tdd
Merge with upstream master
Merge with master
merged farheens pull request and added nav and footer spec
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
Merge pull request #38 from stellajkimm/nav_footer_tdd_2

Nav footer tdd 2
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