Sprint 2 Code 

All stories merged and tested