MZ - lots of wasted work on getting a pop up with a drop down combo box for making labels. checking EVERYTHING in just for fun.
reworked labels - the library I was using (jquery easyui) was incompatible with jquery ui. Labels are now "in line" using he tag-it library.
clean up
added list of your label TYPEs at the top of the page
fixed issue where it always showed James' label types
ended up deleting changes, still making me commit
added a button
Merge remote-tracking branch 'upstream/master'
just trying to merge upstream
Conflicts:
	homer/web/css/style.css
Resolve merge
Refactored the render function to allow for more dynamic programming