Adds about page
modified about
Fixes conflicts
stupid sqlite commit
controllers
merge
Merge remote-tracking branch 'origin/master' into timsnewbranch
Merge branch 'timsnewbranch'