Cleaned up a bit
Handled a merge problem and continued to clean up in projekt
Removed unnecessary file