linked pass step 3
add sign up pages and styles
fixed merge conflict
merge master to simon