Temp changes
Merge branch 'master' of github.com:rngkll/manamic

Conflicts:
	src/manamic.c