Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch master
 Your branch is ahead of 'origin/master' by 2 commits.
   (use "git push" to publish your local commits)

 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	deleted:    "www/completados/completados/Deslizamiento ventral del c\303\263ndilo mandibular.pptx"
	deleted:    www/completados/completados/Memoria.docx
	deleted:    "www/completados/completados/TOMA DE CINTUR\303\223N/TOMA DE CINTUR\303\223N.docx"
	deleted:    "www/completados/completados/TOMA DE CINTUR\303\223N/cintur\303\263n.wmv"
	modified:   www/themes/js/add2home.js

 Untracked files:
   (use "git add <file>..." to include in what will be committed)

	"www/completados/completados/cintur\303\263n.wmv"
5
 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch master
 Your branch is ahead of 'origin/master' by 4 commits.
   (use "git push" to publish your local commits)

 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	deleted:    www/completados/completados/MPS EXTENSION_TBJ.wmv
	deleted:    www/completados/completados/MPS FLEX CCBAJA_TBJ.wmv
	deleted:    www/completados/completados/MPS INCLINACIONES_TBJ.wmv
	deleted:    www/completados/completados/MPS ROTACONES_TBJ.wmv
	deleted:    "www/completados/completados/Mi pel\303\255cula1.mp4"
	deleted:    "www/completados/completados/PROTRACCI\303\223N_RETRACCI\303\223N_TBJ.wmv"
	deleted:    "www/completados/completados/TRACCI\303\223N C2-C5_TBJ.wmv"
	deleted:    www/completados/completados/cervicales1.mp4
	deleted:    "www/completados/completados/cintur\303\263n.wmv"
Merge branch 'master' of https://github.com/mimicla/fisio

Conflicts:
	www/themes/js/add2home.js

 It looks like you may be committing a merge.
 If this is not correct, please remove the file
	.git/MERGE_HEAD
 and try again.

 Please enter the commit message for your changes. Lines starting
 with '' will be ignored, and an empty message aborts the commit.
 On branch master
 Your branch and 'origin/master' have diverged,
 and have 3 and 1 different commit each, respectively.
   (use "git pull" to merge the remote branch into yours)

 All conflicts fixed but you are still merging.
   (use "git commit" to conclude merge)

 Changes to be committed:

	deleted:    www/config.xml
	deleted:    www/fotos_atm.html
	deleted:    www/fotos_cc.html
	deleted:    www/index.html
	deleted:    www/teoria_atm.html
	deleted:    www/teoria_cc.html
	deleted:    www/themes/add2home.css
	deleted:    www/themes/fisios.css
	deleted:    www/themes/fisios.min.css
	deleted:    www/themes/fisios_cc.css
	deleted:    "www/themes/images/Sin t\303\255tulo-1.psd"
	deleted:    "www/themes/images/Sin-t\303\255tulo-2.png"
	deleted:    "www/themes/images/Sin-t\303\255tulo-3.png"
	deleted:    "www/themes/images/Sin-t\303\255tulo-5.png"
	deleted:    "www/themes/images/Sin-t\303\255tulo-6.png"
	deleted:    www/themes/images/ajax-loader.gif
	deleted:    www/themes/images/atm_anatomia_fotos.png
	deleted:    www/themes/images/atm_bio_fotos_800.png
	deleted:    www/themes/images/atm_bio_teoria_800.png
	deleted:    www/themes/images/atm_bio_videos_800.png
	deleted:    www/themes/images/atm_biomecanica_teoria.png
	deleted:    www/themes/images/atm_biomecanica_video.png
	deleted:    www/themes/images/atm_movi_fotos_800.png
	deleted:    www/themes/images/atm_movi_teoria_800.png
	deleted:    www/themes/images/atm_movi_videos_800.png
	deleted:    www/themes/images/atm_movili_fotos.png
	deleted:    www/themes/images/atm_movili_teoria.png
	deleted:    www/themes/images/atm_movili_videos.png
	deleted:    www/themes/images/background.png
	deleted:    www/themes/images/background_800.png
	deleted:    www/themes/images/bio.png
	deleted:    www/themes/images/cc_bio_fotos.png
	deleted:    www/themes/images/cc_bio_fotos_800.png
	deleted:    www/themes/images/cc_bio_teoria.png
	deleted:    www/themes/images/cc_bio_teoria_800.png
	deleted:    www/themes/images/cc_bio_videos.png
	deleted:    www/themes/images/cc_bio_videos_800.png
	deleted:    www/themes/images/cc_movi_fotos.png
	deleted:    www/themes/images/cc_movi_fotos_800.png
	deleted:    www/themes/images/cc_movi_teoria_800.png
	deleted:    www/themes/images/cc_movi_video.png
	deleted:    www/themes/images/cc_movi_video_800.png
	deleted:    www/themes/images/cc_movili_teoria.png
	deleted:    www/themes/images/colu.png
	deleted:    www/themes/images/descarga.png
	deleted:    www/themes/images/glyphicons_008_film.png
	deleted:    www/themes/images/glyphicons_011_camera.png
	deleted:    www/themes/images/glyphicons_011_camera_white.png
	deleted:    www/themes/images/glyphicons_020_home.png
	deleted:    www/themes/images/glyphicons_020_home_white.png
	deleted:    www/themes/images/glyphicons_180_facetime_video.png
	deleted:    www/themes/images/glyphicons_180_facetime_video_white.png
	deleted:    www/themes/images/glyphicons_244_conversation.png
	deleted:    www/themes/images/glyphicons_330_blog.png
	deleted:    www/themes/images/glyphicons_351_book_open.png
	deleted:    www/themes/images/glyphicons_351_book_open_white.png
	deleted:    www/themes/images/glyphicons_410_facebook.png
	deleted:    www/themes/images/hands.png
	deleted:    www/themes/images/home_800.png
	deleted:    www/themes/images/icons-18-black.png
	deleted:    www/themes/images/icons-18-white.png
	deleted:    www/themes/images/icons-36-black.png
	deleted:    www/themes/images/icons-36-white.png
	deleted:    www/themes/images/purple-back-new2.png
	deleted:    www/themes/images/rubi.png
	deleted:    www/themes/images/tm.png
	deleted:    www/themes/js/configs.js
	deleted:    www/themes/js/popup-examples.js
	deleted:    www/themes/popup-examples.css
	deleted:    www/videos_atm.html
	deleted:    www/videos_cc.html