project proposal page added
merge commit - hopefully nothing destroyed
Merge branch 'master' of https://github.com/crankyManky/Ppl2Ppl2

Conflicts:
	src/com/example/ppl2ppl/Registration.java