yo
Merge branch 'master' of https://github.com/zaycev/hackathon-2014

Conflicts:
	log.txt