initializing branch 20140616
initializing branch 20140616
Merge branch 'test_20140616_(130521)'
krypfix
(superfluous)
Merge branch 'test'
added Rbuildignore
Merge branch 'master' of https://github.com/renlund/proh.git

Conflicts:
	.Rbuildignore
	R/clean.r
	man/opts_proh.Rd