=)
Merge branch 'master' of https://github.com/jord14k/ways

Conflicts:
	Site.Master
	View/test.aspx.cs
	View/test.aspx.designer.cs
	bin/ways.dll
	bin/ways.pdb
	obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	obj/Debug/ways.csproj.FileListAbsolute.txt
	obj/Debug/ways.dll
	obj/Debug/ways.pdb
	ways.csproj
	ways.suo
p
aaa
aaa