This is a sample website used to teach a merging scenario using Git.
Assignment 1 for CS490 - a simple website.