dinu modified also 130
fix conflicts
Merge branch 'master' of github.com:dserban/webdev2014fall