Merge pull request #3 from jrahm/master

Made stuff cleaner
Updating Nics Stuff
Merge pull request #4 from jrahm/master

Added boiler plate
Adding class diagrams
better
Merge pull request #5 from jrahm/master

added class diagram
Progress Report
updated files