Merge branch 'master' of https://github.com/cs27x/team2 into merging_branches
Fixing some errors and exporting jars, etc.
Merge pull request #16 from cs27x/merging_branches

Merging branches