'Experiment Templates' link now redirects to the correct page, fixed a typo
Merge branch 'master' of git://github.com/isenseDev/rSENSE into ExperimentTemplate
fixed a merge issue
fix a merge issue
Merge pull request #88 from Evana13G/ExperimentTemplate

Experiment template