Base code
Merge branch 'master' of https://github.com/royaljain/cs296Project