Moved OP to own file, began changing paramters to prevent segfaults
Merge branch 'master' of https://github.com/hpce2014/hpce_cw5

Conflicts:
	src/process_opt.cpp