Merge branch 'Christian'
Merge branch 'master' into Christian
Added home page along with form. login works so far, the registration form is broken though