.
Merge branch 'sprintdetailsstyle'
did some things, added some stuff, making some changes