Small UI changes
added a new entry
fixed conflicts
fixed conflicts
Fixed conflicts
Merge pull request #13 from chinciusan/master

Small UI changes: fixed links, aligned images, divs.