Added files from Nitrous terminal
Merged conflicts