Create README.md
add code syntax highlight, markdown, preview
Update README.md
Update README.md
Update README.md
heroku deployment
simple login
try-commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	bioinf_project/db.sqlite3
Merge remote-tracking branch 'origin/master'

Conflicts:
	bioinf_project/db.sqlite3
Merge remote-tracking branch 'origin/master'

Conflicts:
	bioinf_project/db.sqlite3
Merge branch 'master' of https://github.com/troublezhang/Need-A-Catchy-Name

Conflicts:
	bioinf_project/templates/base.html
	bioinf_project/utils/diff_match_patch.py