Answer Model
Pulled questions
Please enter the commit message for your changes. Lines starting
Merge branch 'feature/model_question' of https://github.com/Andyccs/PYP_Android into feature/model_answer
trial
try
Merge branch 'feature/model_question' of https://github.com/Andyccs/PYP_Android into feature/model_answer

Conflicts:
	PYP/app/src/main/java/com/humblecoder/pyp/MainActivity.java
Merge branch 'feature/model_answer' into develop

Conflicts:
	PYP/app/src/main/java/com/humblecoder/pyp/MainActivity.java
	PYP/app/src/main/java/com/humblecoder/pyp/models/Answer.java