Update read me file
Merge branch 'dev' of github.com:jslinker/CS340