added more text
matched local master to remote master
Merge branch 'master' of github.com:iamdpegg/web

Conflicts:
	hellonew