created latest news
Merge branch 'master' of github.com:codebusiness2014/group-project
another conflict