new files
conflict solved
css resposiveness adopted
Merge branch 'master' of https://github.com/CodeGeeky/catapp11
conflict managed 04:40