Merge pull request #2 from WanderZ/master

Attempt 1
Completed all tasks
Merge remote-tracking branch 'origin/master'

Conflicts:
	coolshot/QueryTest.java