fix php bug
Merge branch 'master' of https://github.com/LookingLA/7Summit-Advisors

Conflicts:
	assets/sassfiles/stylesheets/screen.css
	fuel/application/views/home.php