edit
Merge branch 'master' of https://github.com/JMT2080AD/jmt2080ad.github.com

Conflicts:
	index.html

console merge?