Jctorres00

MERGING JCTORRES00 and MASTER

for table.java
![screen shot 2014-05-21 at 11 20 03 pm](https://cloud.githubusercontent.com/assets/7268051/3050519/5e0e14ce-e17b-11e3-8ad0-d8b98474ba48.png)