Comitting Codiad Updated Branch
Merging HCI with Codiad