Changed .gitignore to ignore VIM swap files (Don't know why folder /hw1 is changed)
Merge branch 'master' of https://github.com/lejboua/edxsaas1