got paperclip to work correctly.  Pdf files can now upload.  There is code on pastebin for how to do validates_presence_of_1_or_other
Merge branches 'master' and 'pdf'
fixed bugs, still need to do validation of link xor pdf
merge
Merge branch 'master' of github.com:seungjoolee/ForwardTutoring
merge
merge