trying to pull again
Merge branch 'master' of github.com:wisefool769/top_proj
to pull
Merge branch 'master' of github.com:wisefool769/top_proj

Conflicts:
	model/.DS_Store
	model/data/.DS_Store
	perhom.r
	writeup/final_project.tex
finished final proj writeup and compiled to pdf