added file read
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/gn_log.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
did stuff