Commit pre-pull
Fixed conflicts
Finished first test of linux output.