touched newfile to resolve issue 54
changed something in newfile
Merge branch 'issue54'
conflictfile added
added conflictfile on master too
merged and resolved conflicts
deleted unnecessary files
new file on test branch
Update newfile
preparation for submodule integration of d3 and mootools
added d3 submodule
Merge branch 'test'