delete blank lines
changed conditional back to the original.
Put class back on shop activity div.
Added javascript alert.
removed default flash notice.
merge conflicts
merge conlicts
Merge pull request #15 from Pwalker86/phil/polishing

Phil/polishing