added in and std
Merge branch 'master' of github.com:sharadmv/cs164-proj1-tests