Defined Assignment 1
Added some files to the webroot
Added webserver files
Added stubs for assignment one
Resolved stupid merging