Convert those spaces to tabs, oh yeah.
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	WhatTodo/MainPage.xaml.cs
	WhatTodo/WPCal.cs