Merge branch 'angular-app'

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

1 files changed, 15 insertions, 0 deletions

diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
new file mode 100644
index 0000000..9a92f3e
--- /dev/null
+++ b/app/assets/javascripts/notes.js
@@ -0,0 +1,15 @@
+(function() {
+	angular
+		.module('nt.Notes', [
+			'nt.NoteService'
+		])
+		.controller('MainController', [
+			'$scope',
+			'NoteService',
+			function($scope, NoteService) {
+				$scope.noteService = NoteService;
+				
+				$scope.noteService.get_notes();
+			}
+		]);
+})();