imported from back_2014_09_30
imported from current
Merge branch 'master' of https://github.com/vkargi/ghostly-octo-halloween

Conflicts:
	file1.txt