Test
Merge remote-tracking branch 'origin/Max'

Conflicts:
	aboutus.html
Edit About Us
Merge pull request #2 from BPAWebDev/David

Edit About Us
Merge pull request #3 from BPAWebDev/master

update