Iteration 3 Revision 2 (cont.)

Recommitted due to .gitignore problems.
.gitignore