Merge branch 'master' into development
Merge pull request #5 from JeroenMathon/master

Pull ahead Development Branch
Merge branch 'development' of https://github.com/JeroenMathon/Vocaloid-Quiz-Android-Edition into development
Merge pull request #6 from JeroenMathon/development

Development