Changed test username to evan
Changed test username to erin
Merged master into feature and resolved conflict with test usernames
Fixed up test username to marko