merge with mighty file
integration with all file
add Timelog checking
Merge branch 'master' of https://github.com/ohmini/hip-1

Conflicts:
	app/controllers/BrownPeterson.java
	app/views/brownPeterson/brown_peterson_exp.scala.html
	conf/routes
	public/javascripts/brownPetersonExperiment.js
	public/stylesheets/main.css
merge to master
import iframe
add demo-data file
Merge pull request #3 from ohmini/master

add demo-data.yml for demo test merge complete