offline conflict trial
Merge branch 'master' of github.com:Aristechius/asset

Conflicts:
	index.html