New Folder
merge
Merge branch 'master' of github.com:Tieru/MyGraphView

Conflicts:
	MyGraphView/Folder/TextFile