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

Conflicts:
	res/Thumbs.db