Commiting. Hope this works.
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml
	MiU/Main/addItem.html
	MiU/Main/index.html
	MiU/Main/js/main.js