version
Merge branch 'master' of https://github.com/michaellaness/michaellaness.v3

Conflicts:
	package.json