new file:   README.md
	new file:   gruntfile.js
	new file:   package.json
Merge branch 'master' of github.com:RomThi/TiCave

Conflicts:
	README.md

	new file:   LICENSE
	modified:   README.md
Merge branch 'master' of github.com:RomThi/TiCave

Conflicts:
	README.md

	deleted:    README.md