Story1 Completed
Merging to master