init
note has been added
label update
update by f01
update by f01 2
added by master
Merge origin/master into f01

Conflicts:
	README.md
f01 changes readme
README.md updated
revented
Merge origin/master

Conflicts:
	README.md
	css/styles.css
	nbproject/project.properties
	nbproject/project.xml
updated readme.