commit before pull on cutting sticks
Merge branch 'master' of https://github.com/Vici37/CSCI562_sem_project

Conflicts:
	cutting_sticks/main3.cpp
	cutting_sticks/makefile
Merge branch 'master' of https://github.com/Vici37/CSCI562_sem_project
Merge branch 'master' of https://github.com/Vici37/CSCI562_sem_project
hmpol matlab and mathematica test files added
Merge branch 'master' of https://github.com/Vici37/CSCI562_sem_project
commit before pull
Merge branch 'master' of https://github.com/Vici37/CSCI562_sem_project

Conflicts:
	railroads/main.cpp
Merge branch 'master' of https://github.com/Vici37/CSCI562_sem_project

Conflicts:
	railroads/input.txt
	railroads/main.cpp
herding frosh started
herding frosh almost works, need some more test input
herding frosh still not working, getting closer
new convex hull alg doesn't error. still wrong answer.
frosh wedge cutout won't work, need new alg. Covex hull seems to work now.
commit before pull
Merge branch 'master' of https://github.com/Vici37/CSCI562_sem_project into frosh_int