Fixed errors and warnings, will test Database
Merge branch 'master' of https://github.com/codman810/fuzzy-ninja