Resolving conflicts
Merge branch 'master' of https://github.com/joarder/prototype.git

Conflicts:
	Prototype/log/log.txt