stopping pull errors
Merge branch 'master' of https://github.com/wetbug75/HelloWeb

Conflicts:
	HelloWeb.v11.suo