fix merge conflict
some changes made in tags
Merge branch 'master' of https://github.com/raluca-elena/restofthings
Merge branch 'master' of https://github.com/raluca-elena/restofthings
fixed for stupid bug