add import for non-base functions & use roxygen for documentation

DESCRIPTION

@@ -1,8 +1,14 @@
 Package: meow
 Type: Package
 Title: Get Random Pictures of Cats
+<<<<<<< HEAD
 Description: Queries http://thecatapi.com for cute cat photos and displays them in yor R session. Meow!
 Version: 0.1.3.9000
+=======
+Description: Queries http://thecatapi.com for cute cat photos and displays them
+    in yor R session. Meow!
+Version: 0.1.3
+>>>>>>> 0d947b3... add import for non-base functions & use roxygen for documentation
 Date: 2015-05-13
 Authors@R: c(
     person(c("Alex", "M"), "Chubaty",
@@ -15,6 +21,10 @@ Authors@R: c(
 URL: http://github.com/achubaty/meow
 BugReports: https://github.com/achubaty/meow/issues
 License: GPL
-Depends: R (>= 3.1.2)
-Imports: jpeg
-Suggests: testthat
+Depends:
+    R (>= 3.1.2)
+Imports:
+    jpeg
+Suggests:
+    testthat
+RoxygenNote: 5.0.1

NAMESPACE

@@ -1,4 +1,6 @@
-# Generated by roxygen2 (4.1.1): do not edit by hand
+# Generated by roxygen2: do not edit by hand
 
 export(meow)
+importFrom(graphics,plot)
 importFrom(jpeg,readJPEG)
+importFrom(utils,download.file)

R/meow.R

@@ -29,7 +29,9 @@ NULL
 #' @return Invisibly returns logical, \code{TRUE} indicating success.
 #'         Invoked for its side effect of displaying a cat picture.
 #'
+#' @importFrom graphics plot
 #' @importFrom jpeg readJPEG
+#' @importFrom utils download.file
 #' @export
 #' @docType methods
 #' @rdname meow-method