commit
pppp
Merge branch 'master' of https://github.com/svphrae184/project2014

Conflicts:
	ex.txt