Merged
Modified the txt file and trying to commit
blah
Merge branch 'master' of https://github.com/bazookan/Quiz_app