Added Peter
Merge RemoteRepository/master

Conflicts:
	src/demo1/Demo1.java