merging
Merge branch 'master' of https://github.com/szmasood/alternis
merging with css
Merge remote-tracking branch 'upstream/master'

Merging working search bar with szmasood
working tiles