Merge pull request #35 from chinenyem/master

css style change
added more styling
updated merge conflict
Merge pull request #37 from CTFigueroa/master

Updated merge conflict
logo