Added timing to question changes
Merge branch 'master' of https://github.com/amandahandler/CS314Android

Conflicts:
	bin/classes.dex
	bin/resources.ap_
Fixed a question and took out Log comments