Initial commit
GUI Completed
conflicts resolved