Merge pull request #3 from acesarewild/master

bets
all changes so far
Merge pull request #16 from amartinez89/master

update 3/1/2013