updated launch_path
added a link to result.html
fixed conflickts
initial commit
Merge branch 'gh-pages' of github.com:MMR-project/analmeeting into gh-pages