Commit From Netbeans
Merge origin/master

Conflicts:
	first.txt
	readme.md
	readme.txt