phonedesign
Merge branch 'master' of https://github.com/c63industries/LudumDare31
Merge branch 'master' of https://github.com/c63industries/LudumDare31
designerphone
Merge branch 'master' of https://github.com/c63industries/LudumDare31

Conflicts:
	C63.LudumDare31.Game/C63.LudumDare31.Game.csproj
	C63.LudumDare31.Game/Notepad.Designer.cs
Merge branch 'master' of https://github.com/c63industries/LudumDare31