firts commit by akos
Merge branch 'master' of https://github.com/geryxyz/uwt2014fall-we