added Prog1Tools
i/ofsfsfs
Merge branch 'master' of git@github.com:mikar/projects.git

Conflicts:
	javaweek/src/grundkurs/InputOutput.java