v1.0 added
master add
Merge branch 'v1.0'

Conflicts:
	Main.java