Stuff
Merge branch 'master' of https://github.com/ruddernz/Beef

Conflicts:
	src/views/MainWindow.java