merging
Merge branch 'master' of https://github.com/adepu/CapTechHTML5
merging