sign in form is now a modal
slight modification to modal header
changed sign up shared devise message
removed one line break
fixed merge conflict
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
merge conflict update