Roxygenized exported functions.
Resolve merge conflict in swirl.R

Merge remote-tracking branch 'gina/master'

Conflicts:
	R/swirl.R