can i edit?
test
Merge branch 'dev_linzerd' of https://github.com/scotfu/gezipuzi into dev_fsc

Conflicts:
	README.md
fix conflics
init like app
rm ~ file
still init
init some
fix
add all
Merge branch 'dev_fsc' of ssh://github.com/scotfu/gezipuzi into dev_linzerd
add template
Merge branch 'dev_linzerd' of https://github.com/scotfu/gezipuzi into dev_fsc

Conflicts:
	README.md
	accounts/models.py~
add admin.py
add template
add template
Merge branch 'dev_linzerd' of https://github.com/scotfu/gezipuzi into dev_fsc

Conflicts:
	README.md
Merge branch 'dev_fsc' of ssh://github.com/scotfu/gezipuzi into dev_linzerd

Conflicts:
	README.md
Update README.md

fix readme
Merge branch 'dev_fsc' of ssh://github.com/scotfu/gezipuzi into dev_linzerd

Conflicts:
	README.md