111
Merge branch 'master' of https://github.com/oikewll/project

Conflicts:
	README.md
changes
add news
c2