Commiting after Completed user Story #17 and #68