Splash page changes added
Merge pull request #9 from daotoo/create_splashScreen

Splash page changes added
added nav buttons and changed gitignore
Merge pull request #10 from jcurtiss/screenNav

added nav buttons and changed gitignore
Merge pull request #11 from seancavanaugh/master

Added database.java into project
Adding Scanner
Added files and made changes for the calendar
Fixed conflicts
Merge pull request #12 from daotoo/calendar_init

Added files and made changes for the calendar
missing scanner code
Merge branch 'session1' of https://github.com/lrohret/bigsky into lucas_scan_test
Merge pull request #1 from daotoo/lucas_scan_test

Lucas scan test
fixed conflicts
Merge pull request #13 from lrohret/session1

initial scan code for android app
Deleted old database file and added new api
Merge pull request #14 from seancavanaugh/DatabaseAPI

Deleted old database file and added new api
Updated databaseAPI to handle strings
Merge pull request #15 from seancavanaugh/update_databaseAPI

Updated databaseAPI to handle strings
FoodFinderActivity changes (still need to do populateResultsList)
Merge pull request #16 from jcurtiss/foodFinderActivity

FoodFinderActivity changes