Merged code from Beginners from 1/11/14
Merge pull request #7 from ZackAlfakir/master

Merged code from Beginners from 1/11/14