Added hw7 stuff.
Re-organizing files.
Merge pull request #4 from nathanshih/hw7

Hw7