adding files
Merge branch 'master' of https://github.com/markasoftware/projectile

Conflicts:
	LICENSE