Merge remote-tracking branch 'Sam/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/pesist/FakeDatabase.java
Merge remote-tracking branch 'Sam/master'
Merge remote-tracking branch 'Cody Howard/master'

Conflicts:
	TGOHProject/src/edu/ycp/cs/cs496/TGOH/MainActivity.java