Jam now functional. left to implement: model and viewcontrol
Merge branch 'master' of https://github.com/alkaline9500/243_GroupProject3