diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000000..5b6a0652566
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+.Rproj.user
+.Rhistory
+.RData
+.Ruserdata
diff --git a/RProgrammingAssignment2.Rproj b/RProgrammingAssignment2.Rproj
new file mode 100644
index 00000000000..8e3c2ebc99e
--- /dev/null
+++ b/RProgrammingAssignment2.Rproj
@@ -0,0 +1,13 @@
+Version: 1.0
+
+RestoreWorkspace: Default
+SaveWorkspace: Default
+AlwaysSaveHistory: Default
+
+EnableCodeIndexing: Yes
+UseSpacesForTab: Yes
+NumSpacesForTab: 2
+Encoding: UTF-8
+
+RnwWeave: Sweave
+LaTeX: pdfLaTeX
diff --git a/cachematrix.R b/cachematrix.R
index a50be65aa44..1e499c53fc9 100644
--- a/cachematrix.R
+++ b/cachematrix.R
@@ -1,15 +1,32 @@
-## Put comments here that give an overall description of what your
-## functions do
+## Will inverse a matrix and cache the result.
 
-## Write a short comment describing this function
+## Takes a matrix and creates a special "matrix" for use with the cacheSolve.
 
 makeCacheMatrix <- function(x = matrix()) {
-
+  m <- NULL
+  set <- function(y) {
+    x <<- y
+    m <<- NULL
+  }
+  get <- function() x
+  setinverse <- function(solve) m <<- solve
+  getinverse <- function() m
+  list(set = set, get = get,
+       setinverse = setinverse,
+       getinverse = getinverse)
 }
 
 
-## Write a short comment describing this function
+## Takes a "matrix" created by makeCacheMatrix and returns its inverse.  If the "matrix" has been inversed before, then a cached inverse is returned.
 
 cacheSolve <- function(x, ...) {
-        ## Return a matrix that is the inverse of 'x'
-}
+  m <- x$getinverse()
+  if(!is.null(m)) {
+    message("getting cached data")
+    return(m)
+  }
+  data <- x$get()
+  m <- solve(data, ...)
+  x$setinverse(m)
+  m
+}
\ No newline at end of file