,m
Merge branch 'master' of https://github.com/jltjohanlindqvist/EDA625.git

Conflicts:
	proj1/src/proj1/Prime.java