Update changes at http://wp.lo/ on 06.10.2014

	Conflict: hahaha.txt [added]