Merge branch 'master' of https://github.com/direnyk/mmc3260-f14-exercises

Conflicts:
1-html-quick-fix.html
Update

Conflicts:
	1-html-quick-fix.html