commiting Thumbs.db
Merge branch 'gh-pages' of https://github.com/mylestan/whatissystems into gh-pages
merging master and gh-pages
Merge branch 'master' into gh-pages
hopefully last Thumbs.db commit
Merge branch 'master' into gh-pages
hid the body.
Merge branch 'gh-pages' of github.com:mylestan/whatissystems into gh-pages

Merged remote changes locally. Forgot to pull :(
committing merge
commiting merge
Merge branch 'master' into gh-pages
added syde vs the rest, fixed map loading