Final Commits for Work Day 2/21/13 - All Errors are resolved

Both elements of our code our working.