fixing conflict
Merge branch 'front-end' into development
Merge branch 'front-end' of github.com:HatStephens/FATS_Rewardr into front-end
merging with dev
Name added to sign up form
simple sign in form for page
Merge branch 'development' of github.com:HatStephens/FATS_Rewardr into development
Merge branch 'front-end' into development
User can sign in via LinkedIn
Merge branch 'development' of github.com:HatStephens/FATS_Rewardr into development
changed mail image placeholder
Merge branch 'front-end' of github.com:HatStephens/FATS_Rewardr into front-end
Merge branch 'development' into dashboard
sign up basic styling
sign up page styling v1
fixed linked in button link
7 tests passing for the User model
sign in form basic v1
little tweek
Merge branch 'front-end' into development