Undo incorrectly handled merge conflict in the achievements controller from Coursemology/coursemology.org#126.
Undo incorrectly handled merge conflict in the achievements controller from Coursemology/coursemology.org#126.

References Coursemology/coursemology.org#100.

dariusf/coursemology.org,allenwq/coursemology.org,nnamon/coursemology.org,Coursemology/coursemology.org,nnamon/coursemology.org,Coursemology/coursemology.org,dariusf/coursemology.org,allenwq/coursemology.org,dariusf/coursemology.org,Coursemology/coursemology.org,nnamon/coursemology.org,dariusf/coursemology.org,allenwq/coursemology.org,dariusf/coursemology.org,Coursemology/coursemology.org,nnamon/coursemology.org,nnamon/coursemology.org,allenwq/coursemology.org,allenwq/coursemology.org,Coursemology/coursemology.org