Add moment.js to list of pre-reqs
Merge branch 'master' of github.com:jrha/artemis

Conflicts:
	README.md