implemented all challenge requirements
merging from Appirio remote
fetch and mergd from Appirio repo