made a chang
Merge branch 'master' of github.com:RevConcept/gitbootcamp

Conflicts:
	file1.php