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
login screen
database up and running, login/registration working,
login layout working
Merge remote-tracking branch 'origin/master'
Fixed build.gradle error inside /app/
Merge pull request #18 from brantunger/master

Fixed build.gradle error inside /app/
Fixing lib error
Moving app/lib
Merge pull request #19 from brantunger/master

Merging local repo and group branch
updated build.gradle
User database
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/build.gradle
Fixing build.gradle merge