Merge branch 'master' of C:\Users\Martin\Desktop\bootcamp\git\non_profit_capstone with conflicts.
added Signin form html. https://app.asana.com/0/19128794071980/21140848412790