Db now uses correct path
Added resource test for db
Merge branch 'master' of https://github.com/rjschu/wheres-my-bus-

Conflicts:
	src/main/java/co/uk/wmb/Main.java