finished_favorites
Mergining stuff I guess

Merge branch 'master' of https://github.com/edethy/GR4