Project Update

- Fixed some wierd commit issues (HEAD >>>>> ===== and other wierd
characters added to project files after commit failed and performed
merge)