Revert to working state
Update warning for MINE function if no measure is called
Update README file with braches descriptions
adding RStudio project files to .gitignore
Delete .gitignore
Merge branch 'dev'

Conflicts:
	R/ipsen_function.R
	R/mat2adj.R
	README.md
Removed strings remaining from the merge in mat2adj.R files
Update README.md file
Removed file AllClasses.R
Remove blank lines from DESCRIPTION
add .gitignore
Added method g2adj for data.frame
Update documentation for mat2adj
Corrected bug on passing parameter from netSI throguh apply functions
Check the test2.R file for testing
Solving issue #30 and #31
Merge branch 'master' of github.com:MPBA/nettools into dev

Conflicts:
	R/netdist.R