Edited 1-25-13
This was edited @ 2:09
Merge pull request #13 from vaqueraa/master

Testing out the [ git push origin master]