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
added some changes to css
Merge remote-tracking branch 'upstream/master' into tests
merging
Merge pull request #42 from sidpatel13/tests

Tests