Git branchcing
master_content
Css modified
master modified
<<<<<<< HEAD
Javascript 
js to master
=======
Javascript 
>>>>>>> js-assignments