asdfg
meh
Merge branch 'master' of https://github.com/oggs91/patternrecognition

Conflicts:
	ue2/matlab_stuff/main2.m