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

Conflicts:
	models/Button.java
	models/Frame.java
	models/Memory.java
no message
no message
Merge branch 'master' of https://github.com/EvertLagerberg/Pruttlab2

Conflicts:
	models/Button.java
	models/Frame.java
	models/Memory.java
Merge branch 'master' of https://github.com/EvertLagerberg/Pruttlab2

Conflicts:
	models/Memory.java
Merge branch 'master' of https://github.com/EvertLagerberg/Pruttlab2
Merge branch 'master' of https://github.com/EvertLagerberg/Pruttlab2
NxN board from args[0] works with 2,4,6
no message