Fixing stuff to push to github.
Merge branch 'master' of https://github.com/ax-jones/umip

Conflicts:
	src/main.c