commit before pulling
Merge branch 'master' of https://github.com/mylestan/whatissystems

Conflicts:
	res/Thumbs.db
added company blurbs
commiting before pull
Revert "commiting before pull"

This reverts commit 9f05e46348a3d374d6ca1174332fec0d36482503.
removed Thumbs.db
Merge branch 'master' of https://github.com/mylestan/whatissystems
commiting Thumbs.db
Merge branch 'master' of https://github.com/mylestan/whatissystems
added company blurbs and logos
updated 6th Floor of E5 to Our Space
Merge branch 'gh-pages' of https://github.com/mylestan/whatissystems into gh-pages
merging master and gh-pages