fiddled with shipping option stuff to offer reduced price shipping as well as free
added clarification to failed login message regarding case-sensitivity of password
Merge branch 'develop'
Merge branch 'shipping-info-reduction-work' into develop
updated shipping option stuff to have reduced price
updated delivery page to reflect reduced-rate shipping
updated app css to try to sort a compile error
started to update cucumber features. updated delivery page with revised text
more work on cucumber features and alteration of checkout text
merge conflict fix