change my name and email database
ignore database merge
ignore .swap file
ignore sqlite3 change
ignore sqlite3
Merge branch 'master' of github.com:zhengjiezxxy/moonbay

Conflicts:
	development.sqlite3
ignore database
removed bootsy and add ckeditor