still just messing about with netbeans.
Merge branch 'master' of https://github.com/byronmurg/Universal-Grid-Access.git

Conflicts:
	new.txt