Lorem Ipsum
Merge branch 'master' of https://github.com/bordeux/XV

Conflicts:
	Gruntfile.js
	package.json