Merge branch 'master' of https://github.com/SimonWaldherr/microjs.com into configurable

Conflicts:
	index.html
update to new colorconverter version
parseTime.js now supports 3 languages (english, german, portuguese)
Merge branch 'parseTime.js' of https://github.com/SimonWaldherr/microjs.com into mymaster
Merge branch 'configurable' of https://github.com/SimonWaldherr/microjs.com into mymaster

Conflicts:
	index.html