Add conflicts
Add conflict to lib/plotbox.rb & views/main.erb
Update version information
Merge branch 'development' for v0.0.10