added more conservative
Merge branch 'master' of https://github.com/ankitvgupta/cs51finalproject