PistachoToDo for Command line with json persistence finished and working
PistachoToDo Web app half way there, loading and appending tasks completed.
Added URLs for WebEng2014 lab 0 project
Merge pull request #2 from daniegarcia254/master

553939 Lab 0 Setup
Update setup.csv
Webapp finished, search filters implemented.
Restructure projects
Update setup.csv
Merge pull request #3 from valarion/patch-1

Update setup.csv
Merge remote-tracking branch 'upstream/master'
Update setup.csv
Merge pull request #6 from RecuencoJones/master

Ahora si :-)
Merge branch 'developer' of https://github.com/daniegarcia254/WebEng2014 into developer
Update setup.csv
Added URLs of Lab0 projects
Removed temporal files
Update setup.csv
Merge pull request #7 from ivanpinos/patch-1

Update setup.csv
Merge branch 'master' of https://github.com/javiertello/WebEng2014

Conflicts:
	labs/setup.csv
Merge branch 'patch-1' of https://github.com/SAReyes/WebEng2014 into
SAReyes-patch-1

Conflicts:
	labs/setup.csv