started css home
finished home page css
fixing conflicts
merging
Merge branch 'master' of https://github.com/meet-projects/eventor-y2-2014