edited Jam.java
Merge branch 'master' of https://github.com/alkaline9500/243_GroupProject3

Conflicts:
	src/Jam.java

added jamviewcontrol