Merge pull request #37 from CTFigueroa/master

Updated merge conflict
logo
Merge pull request #38 from chinenyem/master

logo
js updates