Implemented message input limit

Also fixed the last github conflict in Main.java