Merge branch 'angular-app'

Conflicts:
	app/assets/stylesheets/layouts/_global.scss
	app/views/home/main.html.erb

1 files changed, 25 insertions, 0 deletions

diff --git a/README.md b/README.md
new file mode 100644
index 0000000..f4cf615
--- /dev/null
+++ b/README.md
@@ -0,0 +1,25 @@
+Angular.js Demo: Notes app
+==========================
+
+This is a demo application to explain the basics of AngularJS.
+
+It's a basic notes app that allows you to create, view, and update notes.
+
+![Main screen](screenshots/main.png)
+
+The `NotesController` provides a CRUD API for notes which is then accessed by an Angular application.
+
+
+## Running The App
+
+1. Install gems
+
+		$ bundle install --path vendor/bundle
+
+2. Start the Rails server
+
+		$ bundle exec rails server
+
+
+## License
+Licensed under the MIT License. See the included LICENSE file.