Changed some things around to work better. Should be fine now
Merge branch 'master' of github.com:jnighlight/OSProject

Conflicts:
	src/process_generator.cpp