Merge branch 'master' of https://github.com/litopia/unicat
Working on flexbox
Adding skeleton to css folder
Merge branch 'master' of https://github.com/litopia/unicat

Conflicts:
	index.html
fixing the merge conflict
img changes
Merge branch 'master' of https://github.com/litopia/unicat