Upload complete
Merge branch 'master' of https://github.com/BHouwens/TypeShift

Conflicts:
	Gruntfile.js
	package.json
Merge branch 'master' of https://github.com/BHouwens/TypeShift

Conflicts:
	Gruntfile.js
	package.json