Mail installed, configuration started
add CheckoutsMailer to saved/successful order, change flash notice to prompt user to check their email
fix merge conflict
untracked file
fix file extenstion for order_fulfillment view
Merging origin master into mail_jen branch

Merge branch 'master' into mail_jen
Email to customer once images purchased working, but order saving is not working. Image attachement to email currently hard coded, next step is to have it be dynamic so it attaches the images purchased.
add test to ensure filename of email attachment is correct
move test to admin_orders_controller_spec.rb
fix merge conflict after merging master onto this branch
add Admin namespacing to admin controllers
Merge branch 'master' into mail_jen
add paid method to admin orders_controller
email with hard coded purchased image moved to be sent when Admin updates order status from pending to paid to shipped
emailing images ordered to customer once order is shipped is FUCKING WORKING BITCHES
modified admin_orders test to use real image, added missing image file
Merge branch 'master' into mail_jen