merging changes
modified the settings .py files
Added buy_test page