Merge pull request #1 from EthanBlackburn/master

Initial Upload
Update README.md
Update README.md
Update README.md
Update README.md
testing

Testing how to change the files on github through eclipse on my computer
update 12:21AM 12/5/13
Update Grid.java
update 6:38pm 12/7/2013
Merge pull request #1 from pmarti28/master

Sync with master