Work on Database Whakiness
Merge branch 'master' of https://github.com/danbarlow27/Sunspace
Fixed merge conflict