Melanie's 2st Individual Programming Assignment update 17May2014
Merge origin/master