Merge pull request #1 from ohmini/master

merge intregation complete
before merge intregate
intregate
modify after merge
merge with experiment file
intregret experiment complete
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