Lilybeth Mellado
Merge branch 'master' of https://github.com/lmellado/AWCOnlineStore into lmellado-master

Conflicts:
	AWCOnlineStore/demo.txt
Merge branch 'lmellado-master'