Merge pull request #10 from matcho3/question

Question
fixed
fix
fixed
Merge branch 'master' of https://github.com/matcho3/NewAoba into question
Merge pull request #11 from matcho3/master

Master
Merge branch 'database' of https://github.com/matcho3/NewAoba into question