merged
merged
Merge branch 'master' of github.com:stuycs-softdev/submissions
want to merge
Merge branch 'master' of github.com:stuycs-softdev/submissions
pulled
trying to pull
trying to pull
Merge branch 'master' of github.com:stuycs-softdev/submissions
trying to pull
Conflicts:
	7/intro-proj1/chris-brian/Analysis_Final_sike.html
Merge branch 'master' of github.com:stuycs-softdev/submissions
pulled
Merge branch 'master' of github.com:stuycs-softdev/submissions
pulling
Merge branch 'master' of github.com:stuycs-softdev/submissions

Conflicts:
	7/intro-proj1/chris-brian/Analysis.html
Merge branch 'master' of github.com:stuycs-softdev/submissions
"css file"