public option added
Merge branch 'master' of github.com:luckyx1/NACLA_2.0 into public_option
public and featured added
edit confirmation changes
edit confirmation
files add
Search page now separates view for articles and coursepacks. Username field still needs fixing.
Merge branch 'master' of https://github.com/luckyx1/NACLA_2.0
download working
Merge branch 'master' of github.com:luckyx1/NACLA_2.0 into article_download
allow admins to delete other users. added a rescue from recordnotfound error if a user doesn't exist.
Merge branch 'master' of github.com:luckyx1/NACLA_2.0
renamed
Merge branch 'master' of github.com:luckyx1/NACLA_2.0
back_url added
edit/show
crap
mrege
stuff
minor change to cancel