Updated fixed header code
Merge branch 'master' of https://github.com/revivemarketing/ELWeb

Conflicts:
	js/app.js
Merging
Merging