Cleaned up merge junk!
Remove .suo
Update ignore