Merge pull request #4 from lrohret/master

Deleted 2 text documents
skeleton layout and corresponding java files
Merge pull request #5 from jcurtiss/master

Skeleton layout and corresponding java files
deleted metadata folder
Merge pull request #6 from jcurtiss/deletemeta

deleted metadata folder
added .gitignore file to ignore .metadata
Merge pull request #7 from jcurtiss/gitignore

Added .gitignore file to ignore .metadata
Added database files
Merge pull request #8 from daotoo/database_file

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

Splash page changes added
added nav buttons and changed gitignore
Added database.java into project
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
Fixed conflicts
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