Merged Master into Ben

Daniel added database functionality.
Merge remote-tracking branch 'origin/master' into Ben
Merged Master in
Basic outline for pulling data from remote DB (non-functional)
background image
Merge remote-tracking branch 'origin/Ben'
Added background image
closer... (pre-merge?)
Merge remote-tracking branch 'origin/master'
Adding images and background to main scrren
Parsing JSON object works now
Merge branch 'query'
Merge remote-tracking branch 'origin/master' into Alex