added legacy dir with docs
added legacy docs
added legacy docs, even db as record of what looked at
deploy addr and user-pass
add rake stats output
Delete courseware_SPECIFY FEATURES.odt

will readd without space
renamed space-named file and readded it
changed view added _merge, rippled to controllers/admin/content and routes.rb, need to start rspec on controller merge and then do model's merge
FFFFFFFFFFFF bills
good functioning but whitespacey
yay clicking works
err in template id and still err in controller passing a Page, may be ok once we get feedback in feature file data
added feature file and steps file
before debug article show format
Merging the merge projects
Merged
elim _merge partial junk
switch controller to merge model inst method
refactoring hw1.1
merged with mach1010