project setup
Merge branch 'master' of https://github.com/jegasmlm/dotadev

Conflicts:
	.gitignore
	README.md