Marking and Cookies implimented. No Image Files yet, need to be placed in website/static/img/favicon.ico and website/static/imgfavOff.ico (or the code should be changed. either way)
Merge My changes into master

Merged -Tim