home
Merge branch 'master' of https://github.com/PhoenixRockit/team_avnet

Conflicts:
	public_html/styleGuide.css
	templates/homeView.php