recovered old files
merged recovery branch
added resources
merge skipped article controller
fixed typos in article model