Second version bump after creating 2.14 release branch.


git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/fmcsR@88840 bc3139a8-67e5-0310-9ffc-ced21a209358
changed vignette to markdown and html output
conflicts resolved while setting up Git-SVN bridge
Merge branch 'knitr'

Conflicts:
	DESCRIPTION
removed old vignette
Commit made by the Bioconductor Git-SVN bridge.
Consists of 3 commit(s).

Commit information:

    Commit id: bef7e9ce6e2b43e9a2930347f7f36caf12fda66a
    Commit message:
    changed vignette to markdown and html output
    Committed by khoran <khoran at cs.ucr.edu>
    Commit date: 2014-04-28T10:11:57-07:00

    Commit id: 02457aced8fd753ac7cfba850a26d24f4d360dea
    Commit message:
    Merge branch 'knitr'

    Conflicts:
    	DESCRIPTION
    Committed by khoran <khoran at cs.ucr.edu>
    Commit date: 2014-04-28T10:22:44-07:00

    Commit id: 7a1f6b5414c837a91ce4fa7a0e9214d08c7dfca6
    Commit message:
    removed old vignette
    Committed by khoran <khoran at cs.ucr.edu>
    Commit date: 2014-04-28T10:30:15-07:00

From: Bioconductor Git-SVN Bridge <bioc-sync@bioconductor.org>

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/fmcsR@89583 bc3139a8-67e5-0310-9ffc-ced21a209358
Merge branch 'release-1.6'

Conflicts:
	DESCRIPTION
Merge branch 'real_master'
updated vignette to html version