Ready for first due date submission

I removed the old branch, and made Atef's branch the current one. I know
it's messy, but I needed a record of the two I was working on.
Other than that, I made some formatting changes.
It's completely ready for the first due date submission.