blaatiedieblaat
Merge branch 'master' of ssh://cup-a-sep.nl/var/git/project
Added semicolon to jasmine
Porno
Merge remote-tracking branch 'origin/master'
project file gestaged
Merge branch 'master' of ssh://cup-a-sep.nl/var/git/project

Conflicts:
	.project
For those of you about to Rock!
Merge remote branch 'origin/master'

Conflicts:
	.project
	www/index.html
Test commit nummer honderd
uhhhhh .project bestand gestaged denk ik
Test Commit Florian
Merge branch 'master' of ssh://cup-a-sep.nl/var/git/project

Conflicts:
	.project
	www/index.html
blabla test
Eerste demo
Fixed de standaard tijd in de planner (van GMT naar local)
Server ip changed to domain
custom .gitignore
Merge branch 'master' of ssh://cup-a-sep.nl/var/git/project

Conflicts:
	.gitignore
Createde storage js file and storage test page