idiot commit
merge
file upload through model
Merge pull request #4 from bigjey/master

dasfgh