removed vote.js file
removed vote.js.file
Merge branch 'siyan' of https://github.com/sbeverly/dbcoverflow
add upvote and downvote functionalityon answers controller
resolved merge conflict
fixed answers controller
Added documentation and contributing developers to README
fixed signup nav bar stuff
Merge branch 'master' of https://github.com/xander-f/dbcoverflow
Add documentation and credit to contributing developers
Add Bootstrap styles
removed unecessary form file
changed login button to read login
update user model to authenticate against username rather than email
fixed user authentication in user model
add login errors if incorrect user authentication
Merge pull request #6 from xander-f/user_login

User login
removed unused form
Merge branch 'master' of https://github.com/xander-f/dbcoverflow
Modified Google fonts link to use Rails conventions