Merge pull request #1 from joshuapena/master

Fixed Problem
push
merge
i cant even understand
stuff
Merge remote-tracking branch 'upstream/master'