completely different thing
Merge remote-tracking branch 'origin/mergeconflict'

Conflicts:
	Lab2PushPull/src/Main.java
Fixed
MERGE CONFLICT #2 >:(
Added List implementation, MERGE CONFLICT #2
Merge remote-tracking branch 'origin/work'

Conflicts:
	Lab2PushPull/src/Main.java
Merge branch 'master' of https://github.com/crpoon/Lab2PushPull.git into
work

Conflicts:
	Lab2PushPull/src/Main.java