merge conflicts
merge conflict 2
Finished basic tags search
Merge pull request #16 from Bazay/master

Finished tag search
add static pages
merge search feature
merge?