added files and changes some small things
Merge remote-tracking branch 'origin/jeff' into wes

Conflicts:
	mobile/index.html
Merge remote-tracking branch 'origin/tal' into wes
minor update to roles
Merge remote-tracking branch 'origin/jeff' into wes

Conflicts:
	index.html
commenting the css files
Merge remote-tracking branch 'origin/wes' into tal
fixing footer
footer fixed
sync
Merge remote-tracking branch 'origin/tal' into wes
Merge remote-tracking branch 'origin/jeff' into wes

Conflicts:
	index.html
css change for team images
Merge remote-tracking branch 'origin/tal' into wes
Merge remote-tracking branch 'origin/jeff' into wes

Conflicts:
	index.html
mCustomScrollBar
Merge remote-tracking branch 'origin/tal' into wes
Merge remote-tracking branch 'origin/jeff' into wes

Conflicts:
	mobile/assets/css/work.css
	mobile/index.html
fixed merge conflict