commit to get
no more marcos.

Conflicts:
	src/se/chalmers/tda367/group25/resumate/io/IOHandler.java