Merge branch 'master' into alternate

Conflicts:
QueueUnderflow/bin/QueueUnderflow.apk
QueueUnderflow/bin/classes.dex
QueueUnderflow/bin/classes/ca/ualberta/cs/queueunderflow/R$id.class
QueueUnderflow/bin/resources.ap_
QueueUnderflow/gen/ca/ualberta/cs/queueunderflow/R.java

QueueUnderflow/src/ca/ualberta/cs/queueunderflow/views/AskAQuestionActiv
ity.java

QueueUnderflow/src/ca/ualberta/cs/queueunderflow/views/MainActivity.java