Level loading
Merge branch 'master' of https://github.com/lericson/mamorie

Conflicts:
	src/se/kth/mamorie/Board.java
Merge branch 'master' of https://github.com/lericson/mamorie

Conflicts:
	src/se/kth/mamorie/Board.java