Commited main code and html