Links for bagdges fix and modals if not logged in.
resolve merge conflict
Merge pull request #26 from purple-martins-2013/classy_wiggle

Links for badges fix and modals if not logged in.