first commit
added index file...testing github hosting capabilities
Added content for Homework 2
Merging Changes with Assignment 2
Attempting to merge once more