Updated dependancies
Merge branch 'master' of github.com:davidpaulrosser/platonic-project

Conflicts:
	package.json