qwe
v
Merge branch 'master' of https://github.com/Heshitha/TeemaApplicationFinal

Conflicts:
	TeemaApplication.v12.suo