lalala
Merge branch 'master' of https://github.com/grasingerm/minear.git

Conflicts:
	src/minear.hpp