Add a new printline
Modify printline
Conflict check
Merge branch 'master' of https://github.com/pbartha/TheTwoTowers

Conflicts:
	src/main/Main.java
round 2
Back to normal life
Delete comments on main
add confict desc.
Added coflict
ext. conflict message
Ext conflict by szaki
Delete conflicts
Implementing Controller Build functions