added lost changes
Merge branch 'master' of https://github.com/ciprif/Hackathon_2014