Merge Image editing branch

Implemented image editing, implemented a few more tests, and fixed some html