Merge pull request #4 from CST316GroupO/master

Merge Lastest Changes
Merge remote-tracking branch 'upstream/master'
Merging group code to local repo on Linux machine
Added base for yelp API
Adding libraries
Adding yelp Test base
Merge pull request #17 from brantunger/master

Merging local repo and group branch