Web 150: Assignment 6

Functionality
Assignment #6
Revert 82a2bdb..6ba0962

This rolls back to commit 82a2bdb4dc762ab9d60858569898dbe618ea96aa.