false
Merge branch 'master' of https://github.com/Nichoglass/DM2518

Conflicts:
	index.html