Merge remote-tracking branch 'origin/jeff' into wes
Merge remote-tracking branch 'origin/tal' into wes
adding mobile css
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
Merge remote-tracking branch 'origin/wes' into jeff
minor update to roles
added content to work page
Merge remote-tracking branch 'origin/jeff' into wes

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