Worked on argument parsing - DOES NOT WORK!!!
C-s

:x
D
D
B
B
C
C
C
C
C
C
C
Merge branch 'master' of https://github.com/Shaolian/Roy_DrouinMorin_TP1

Conflicts:
	src/main/Main.java

Merging stuff