comitting master template because live server edits