Merge branch 'tryToMerge'
fixed merging problems
had to pull current master
make work for local
tell how many comments you have
num of articles now work