Add gitignore to branch
Update the UML class diagram
Update the class diagram
Update gitignore
Update Feature Plan
Merge shahdk