Merge branch 'master' into models
Merge branch 'master' into models
Merge branch 'master' into models
Merge branch 'master' into models
styling homepage
fixed merge conflict
Merge pull request #4 from dashinfall3/models

models
index merged conflict