camilin87/senior_project — pull request #218 by kmoya002 (2013-04-26 10:13:29+00:00)
Title: Merge pull request #215 from camilin87/master

merge last changes to my branch