Merge pull request #2 from CST316GroupO/master

 	SQL server info
Merge pull request #3 from CST316GroupO/master

added er diagram for the database.
Merge pull request #3 from CST316GroupO/master

Grabbing latest changes
Merge pull request #4 from CST316GroupO/master

Merge Lastest Changes
Fixed the rendering error, changed theme for helpscreen
Merge pull request #13 from brandonespana/master

Fixed the rendering error, changed theme for helpscreen
Merge pull request #14 from gmann1/master

jh
login screen
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'upstream/master'
Getting Gabe's changes
Added help and main activity, added action bar values
 'Help' action now goes to the help page activity from the main screen
Merge remote-tracking branch 'upstream/master'
Merging group code to local repo on Linux machine
Removed some unneeded files that I created when making the new activities help and mainscreen, and added responses to action buttons
Merge pull request #16 from brandonespana/master

Action Bar buttons
Merge remote-tracking branch 'upstream/master'
Added base for yelp API
Adding libraries
Adding yelp Test base
Merge pull request #17 from brantunger/master

Merging local repo and group branch