Connected the restful service to the directory reading functions. A list of files can now be shown on the page.
Merge issues.
Merge branch 'master' of https://github.com/camsnz/mast

Conflicts:
	src/main/java/com/example/helloworld/resources/HelloWorldResource.java
Changed search mechanism and merged file list. Adding some html and css for thought.
Adding new resources.
Merge branch 'master' of https://github.com/camsnz/mast

Conflicts:
	src/main/resources/mastapp/index.html