Fixed a slight bug with how the file got merged

Fixed a mere error
Found a few more merge errors

Fixed some more errors, we need to look into a better way to handle
merges.
kind of updated the node and pacman mulit

updated the vs project to not include nonexistent files
This updates the project file to not have duplicates

Cleaning up the project file
Merge pull request #10 from TeamAwesome5u/Micah

Micah