Best Code Ever
Merge branch 'master' of https://github.com/denchiosa/multiproject.git

Conflicts:
	mardari/.gitignore
	mardari/myLogFile.log