conflict conflict...

Conflicts:
	2013/events/nokia-microsoft-wp-contest_v2.html