Renamed resource test and added localhost port
Merge branch 'master' of https://github.com/rjschu/wheres-my-bus-
Merge branch 'master' of https://github.com/rjschu/wheres-my-bus-
Mongo Finally working locally
Merge branch 'master' of https://github.com/rjschu/wheres-my-bus-

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