makefile stuff
Merge branch 'master' of https://github.com/rbryan/psychic-dangerzone
merged

Conflicts:
	main.c