moved into www
Merge branch 'master' of https://github.com/kovaka/CS-196