Merge branch 'master' of github.com:adaam2/docker-rails-react-starter

Author: adaam2

README.md

@@ -1,3 +1,10 @@
+# Technologies
+- Docker compose
+- Postgresql
+- Nginx proxy
+- Ruby on Rails 5 (API only)
+- React + Redux + Redux Thunk + Reselect
+
 # Setup && running the application
 
 Before you run the application for the first time, you must create the database and run migrations:
@@ -117,4 +124,4 @@ Ruby version (through rbenv):
 ```
 ➜ react-rails-docker git:(master) ✗ ruby -v
 ruby 2.5.0p0 (2017-12-25 revision 61468) [x86_64-linux]
-```
+```