Made some layout changes, deleted the bin and obj folders.
Forgot something
Merged and hopefully didn't break a thing!
Merging annotation logic.
Need to commit before pulling
Commiting to pull. Working on annotation bugs when html is involved.
merging
You can annotate text on the front page, and the annotations persist, but the annotations don't load from the db yet.