e enter the commit message for your changes. Lines starting
Deleting
:wq
Merge branch 'master' of https://github.com/orlando1409/CodeFest2014

Conflicts:
	.idea/misc.xml
	.idea/modules.xml