completed assignment 2
Merge branch 'master' of https://github.com/ashes2014/ProgrammingAssignment2