added 2 tests pass for Computer_Spec.rb
passed all Computer tests
Merge remote-tracking branch 'upstream/master' into tests
merging
fixing conflict
fixing conflict
passed all tests for computer class
Merge remote-tracking branch 'upstream/master' into tests
merge conflicts
added button to navigation div in html
some gemfile shit
trying to resolve merge issues- deleted id that might be causing it
added some changes to css
Merge remote-tracking branch 'upstream/master' into tests
merging
Merge pull request #42 from sidpatel13/tests

Tests
merge conflicts fixed
Merge pull request #43 from sidpatel13/solving_fahia_issues

solving sids merge conflicts
Merge pull request #44 from cassiemoy/master

:)
fix merge changes
Merge pull request #46 from aedwards12/modals_modal

fix merge changes
Work on CSS and HTML to make things more centered.
Fix merge conflict.