starting this project
fix merge and first push