Working stuff
Merge branch 'master' of https://github.com/dkirschl/CS307Project

Conflicts:
	PlayBoiler/src/cs307/team7/playboiler/MySqlLiteHelper.java
Merge branch 'master' of https://github.com/dkirschl/CS307Project

Conflicts:
	PlayBoiler/src/cs307/team7/playboiler/MySqlLiteHelper.java