home
hone
Merge branch 'HEAD' of https://github.com/nonumber1989/Manjusaka.git
h
Merge branch 'HEAD' of https://github.com/nonumber1989/Manjusaka.git

Conflicts:
	app/index.html
Merge branch 'HEAD' of https://github.com/nonumber1989/Manjusaka.git
Merge branch 'HEAD' of https://github.com/nonumber1989/Manjusaka.git
h
Merge branch 'jasmin' of https://github.com/nonumber1989/Manjusaka.git

Conflicts:
	.idea/workspace.xml
g
ok