some studpic chnages
fdaf
Merge branch 'master' of https://github.com/jaiwalker/lartasks

Conflicts:
	.idea/workspace.xml
thisis
this is
product and prices