init, not working
Merge branch 'master' of github.com:team461WBI/website into photo-markdown
fail
Merge branch 'master' of github.com:team461WBI/website into photo-markdown
Merge branch 'master' of github.com:team461WBI/website into photo-markdown
working
Merge branch 'photo-markdown' of github.com:team461WBI/website