Site is ready to go
Merge branch 'master' of github.com:dwysocki/csc344