Achievements

Nothing fancy, didn't actually change anything. This one's merged with the master though, instead of rebased. That should make our future pull requests way easier. I hope.
guess :coffee: script way would prefer `and` than `&&` :smile: