EditPatternGUI 13/12/2014 14:19
Merge branch 'master' of https://github.com/Sjuuls/Theepot-2.git

Conflicts:
	src/Main/Main.java