committing changes

got everything up and running, except for the commenting on comments bonus