working on homepage css
merge fix
Changed git ignore
including settings file
Merge branch 'master' of https://github.com/meet-projects/survme-y2-2013