Renamed master template, added correct collections to server.js
Merge pull request #36 from sgtonkin/feature/collections