a commit
dot ignore file
Merge pull request #4 from maximosanz/master

base.html
nav-bar
nav-bar2
nav-bar fixed
nav format
img
pre-merge
pre-merge2
merge