adding flot
flot test
merge