file
Merge branch 'master' of https://github.com/hansparsons/SharePage

Conflicts:
	WebSite4/Default.aspx
	localhost_50990.v12.suo