why me why all the time me
Merge branch 'master' of https://github.com/CMPUT301F14T04/Funtime-Runtime-Project

Conflicts:
	Funtime-Runtime/src/ca/ualberta/cs/funtime_runtime/AuthorQuestionActivity.java