initial empty readme files
modified Readme
modified Readme
test modification
Testing
test edit for user francesco from svn server
Merge branch 'master' of http://svn.liquidjournal.org/timeline
gitignore build and upload page
Merge branch 'master' of http://svn.liquidjournal.org/timeline
Merge branch 'master' of http://svn.liquidjournal.org/timeline
versione con upload
Merge branch 'master' of http://svn.liquidjournal.org/timeline
Merge branch 'master' of http://svn.liquidjournal.org/timeline
no big change
Merge branch 'master' of http://svn.liquidjournal.org/timeline

Conflicts:
	data-collection/crowdMemories/build/web/WEB-INF/classes/crowdMemories/Submit.class
	data-collection/crowdMemories/build/web/index.jsp
	data-collection/crowdMemories/dist/crowdMemories.war
	data-collection/crowdMemories/nbproject/project.properties
Merge branch 'master' of http://svn.liquidjournal.org/timeline
version with less scrolling
updated ignore file
new remote repository for the reminiscens tablet client
initial structure for the reminiscens api