extracting upload into upload module
extracted the fileupload into its own script, also added flash error and messages to the layout.haml
deleted unnecessary files and added merge resolutions
resolved merge conflicts
removed extraneus files