Dealing with more exceptions / queue
Merge remote-tracking branch 'origin/master'

Conflicts:
	EasyA-Android/src/ca/ualberta/cmput301f14t16/easya/Model/Queue.java
Merge branch 'master' of https://github.com/CMPUT301F14T16/QuestionAppProject