n
a
del
c
a
new
-add
-new
add
-modify
-modify
Merge branch 'master' of https://github.com/letannha/app.git

Conflicts:
	index.html