Now committing my files to the correct project.

Previous commit note: Generic cases have been fixed and are working.
NOTE: Added two special cases that were not covered in my previous
builds because I always assumed computer would go first.
Merge pull request #1 from SnoBoarder/master

Now committing my files to the correct project.