fixing conflict
Merge branch 'front-end' into development
merging with dev
simple sign in form for page
Merge branch 'development' of github.com:HatStephens/FATS_Rewardr into development
Merge branch 'front-end' into development