Updated ChangeLog to reflect the beginnings of 0.5
changed error background from red to yellow
Removing duplication code.
tweaking expected: got: display
changed formatting of file
Fixing merge
fixing border display issue
Failed step displays in red text
Merge branch 'release0.5' of https://github.com/cheezy/pretty_face into release0.5
removing rounded border radius, finishing false indication step
fixing merge conflicts
merge conflicts
where did that end come from?