diff --git a/Projects/Windchill-App.md b/Projects/Windchill-App.md
new file mode 100644
index 00000000..f53d7b19
--- /dev/null
+++ b/Projects/Windchill-App.md
@@ -0,0 +1,29 @@
+# Windchill
+
+Windchill combines the actual temperature with the wind speed to calculate
+the windchill factor, or what the perceived temperature is versus the actual
+temperature.
+
+## User Stories
+
+-   [ ] User can enter the actual temperature (Celcius) and the wind speed
+(kilometers per hour)
+-   [ ] User can press the `Calculate` button to display the wind chill
+-   [ ] User will receive and error message if data values are not entered
+or if the resulting wind chill factor is greater than or equal to the
+actual temperature.
+-   [ ] User will be prompted to enter new data values if `Calculate` is 
+pressed without first changing at least one of the input fields.
+
+## Bonus features
+
+-   [ ] User can select the measurement system calculations will be performed
+in - metric or English.
+
+## Useful links and resources
+
+[Wikipedia Wind Chill](https://en.wikipedia.org/wiki/Wind_chill)
+
+## Example projects
+
+[Wind Chill Calculator](http://www.jsmadeeasy.com/javascripts/Calculators/Wind%20Chill%20Calculator/index.htm)
diff --git a/README.md b/README.md
index 0b78e426..fb428c2f 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,11 @@ Each project has the following **features**:
 | [Pomodoro Clock](./Projects/Pomodoro-Clock.md)                     |
 | [Slack Archiver](./Projects/Slack-Archiver.md)                     |
 | [String Art](./Projects/String-Art.md)                             |
+<<<<<<< HEAD
 | [Timezone Slackbot](./Projects/Timezone-Slackbot.md)                |
+=======
+| [Windchill](./Projects/Windchill-App.md)                           |
+>>>>>>> 8f5f3eb847f52c8d2d5f8ba30af03f718303c4ea
 
 ## Contribution