more files
fixing conflict
Merge branch 'master' of https://github.com/cjaffe/cjaffe.github.io