no message
Merge branches 'master' and 'master' of https://github.com/EvertLagerberg/Pruttlab2

Conflicts:
	models/Frame.java
	models/Memory.java