From 8231414961a3fc13a604e888cfa4a6087952460b Mon Sep 17 00:00:00 2001
From: Chris <christopher.stumper@uconn.edu>
Date: Tue, 28 Nov 2017 20:36:07 -0500
Subject: [PATCH 1/2] README added

---
 README.md  | 29 ++++++++++++++++++++++
 readme.rst | 70 ------------------------------------------------------
 2 files changed, 29 insertions(+), 70 deletions(-)
 create mode 100644 README.md
 delete mode 100755 readme.rst

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..6a36455
--- /dev/null
+++ b/README.md
@@ -0,0 +1,29 @@
+# Final Project
+## DMD 4470
+For your final project you will work in teams of 2 to build a fully-functioning web application that emulates the core functionality of Twitter. For the purposes of this assignment, you are to assume that every user automatically “follows” every other user. Design counts!
+
+### Must-have features
+1. New user registration.
+2. Login (session management)
+3. User profile page with the users’ tweets.
+4. View tweets from all users.
+5. Ability to “Like” tweets when logged-in
+6. Ability to search all tweets.
+
+### Optional Features
+1. DMs
+2. Hashtags
+3. Retweet
+4. Replies
+
+### General Requirements
+1. The application will utilize PHP, MySQL and an MVC framework of your choosing.
+2. Optional: You may use PHP/MVC strictly as an API with a JavaScript frontend.
+3. The application database should contain at least 2 tables that are relational.
+4. The application must allow input that is stored in the database.
+5. The application must not break from faulty user input.
+6. Your team must use Git/Github to host the source code for your application.
+7. Each teammate should contribute equally to the project.
+7. Your Git repository should contain a local-development environment.
+8. Your README file must include detailed instructions for running your application locally.
+9. The application must function locally and when deployed to production (the DMD web server or an alternative server)
diff --git a/readme.rst b/readme.rst
deleted file mode 100755
index b652008..0000000
--- a/readme.rst
+++ /dev/null
@@ -1,70 +0,0 @@
-###################
-What is CodeIgniter
-###################
-
-CodeIgniter is an Application Development Framework - a toolkit - for people
-who build web sites using PHP. Its goal is to enable you to develop projects
-much faster than you could if you were writing code from scratch, by providing
-a rich set of libraries for commonly needed tasks, as well as a simple
-interface and logical structure to access these libraries. CodeIgniter lets
-you creatively focus on your project by minimizing the amount of code needed
-for a given task.
-
-*******************
-Release Information
-*******************
-
-This repo contains in-development code for future releases. To download the
-latest stable release please visit the `CodeIgniter Downloads
-<https://codeigniter.com/download>`_ page.
-
-**************************
-Changelog and New Features
-**************************
-
-You can find a list of all changes for each release in the `user
-guide change log <https://github.com/bcit-ci/CodeIgniter/blob/develop/user_guide_src/source/changelog.rst>`_.
-
-*******************
-Server Requirements
-*******************
-
-PHP version 5.6 or newer is recommended.
-
-It should work on 5.3.7 as well, but we strongly advise you NOT to run
-such old versions of PHP, because of potential security and performance
-issues, as well as missing features.
-
-************
-Installation
-************
-
-Please see the `installation section <https://codeigniter.com/user_guide/installation/index.html>`_
-of the CodeIgniter User Guide.
-
-*******
-License
-*******
-
-Please see the `license
-agreement <https://github.com/bcit-ci/CodeIgniter/blob/develop/user_guide_src/source/license.rst>`_.
-
-*********
-Resources
-*********
-
--  `User Guide <https://codeigniter.com/docs>`_
--  `Language File Translations <https://github.com/bcit-ci/codeigniter3-translations>`_
--  `Community Forums <http://forum.codeigniter.com/>`_
--  `Community Wiki <https://github.com/bcit-ci/CodeIgniter/wiki>`_
--  `Community Slack Channel <https://codeigniterchat.slack.com>`_
-
-Report security issues to our `Security Panel <mailto:security@codeigniter.com>`_
-or via our `page on HackerOne <https://hackerone.com/codeigniter>`_, thank you.
-
-***************
-Acknowledgement
-***************
-
-The CodeIgniter team would like to thank EllisLab, all the
-contributors to the CodeIgniter project and you, the CodeIgniter user.

From e775ff72ac8ae65ca8232dfe2fb01ca18c15c881 Mon Sep 17 00:00:00 2001
From: Chris <christopher.stumper@uconn.edu>
Date: Tue, 28 Nov 2017 20:36:56 -0500
Subject: [PATCH 2/2] removed .txt

---
 example.txt | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 example.txt

diff --git a/example.txt b/example.txt
deleted file mode 100644
index e69de29..0000000