Merge branch 'master' of https://github.com/atrevas/RepData_PeerAssessment1

Conflicts:
	PA1_template.md
Merge branch 'master' of https://github.com/atrevas/RepData_PeerAssessment1

Conflicts:
	PA1_template.md