arreglado formato story
Merge branch 'master' of https://github.com/m2march/isw2

Conflicts:
	tools/parserStories.py
arreglado el stilo de los user stories