fix a bug
delete ignore files
rename assignment 4
Merge branch 'master' of https://github.com/roggenbrot42/rkptum2013

Conflicts:
	assignment4.tar