Merge branch 'master' of github.com:jb3-2/RepData_PeerAssessment1

Conflicts:
	PA1_template.html
Merge branch 'master' of github.com:jb3-2/RepData_PeerAssessment1