committing some tests
resolved merge conflict
readded website.iml
added dsl.jar