edit get.File.java
edit copyright
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
edit get.File.java
edit copyright
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main.java
edit get.File.java
edit copyright