added *.html~ to .gitignore
Merge branch 'master' of https://github.com/meet-projects/survme-y2-2013