Commiting changes to src.pro
Merge branch 'master' of github.com:hasithvm/lasm

Conflicts:
	src/src.pro
Merge branch 'master' of github.com:hasithvm/lasm