Merge pull request #2 from MiguelABarbosa/mike

Mike
update my copy
update my files to develop
test for view and form
Merge pull request #4 from MiguelABarbosa/jeff

Jeff
Deleted .idea/workspace.xml