Workspace edit
Merge branch 'master' of github.com:rohdef/EagleEye2

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of github.com:rohdef/EagleEye2

Conflicts:
	.idea/workspace.xml
Removed conflicting files
Added missing library
Merge branch 'master' of github.com:rohdef/EagleEye2

Conflicts:
	.idea/workspace.xml
	src/dk/au/cs/EagleEye2/EagleEye.java