included data/img
Merge branch 'master' of github.com:v-github/dissertationProject
merged with laptop changes
mainpage design started