Added basic map loading
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/llc/LLC.java