gramirezualberta/Team04Project — pull request #1 by gramirezualberta (2014-03-04 04:32:14+00:00)
Title: Merging Master with GUI

GUI is a testing area for new feature.. only merge when test = Ok