Added a console that initiates if no arguments were passed from terminal
Merge conficts fixed