updated sign in
fixing merge
fixing merges
Merge pull request #34 from Fitzclutchington/master

signin bootstrap