Merge pull request #2 from jdorfman/tjasko

adding in close button for right orange thingy
sprint nov 27 changes