Merge pull request #5 from sherwyngoh/feature/contacts

Feature/contacts
Added frontpage
fixed merge errors
Merge branch 'master' into feature/contacts