trying to pull
conflictMerge branch 'master' of https://github.com/avibagla/intheknow
commit
fixed errors