Changes to be committed:
	modified:   client/writer/app/controllers/homeController.js
	new file:   client/writer/app/templates/directives.js
	new file:   client/writer/app/templates/dropdown.js
	new file:   client/writer/app/templates/menu.js

 Changes not staged for commit:
	deleted:    client/writer/app/templates/directives.js
	deleted:    client/writer/app/templates/dropdown.js
	deleted:    client/writer/app/templates/menu.js
 Changes to be committed:
	deleted:    client/writer/app/templates/directives.js
	deleted:    client/writer/app/templates/dropdown.js
	deleted:    client/writer/app/templates/menu.js
Merge branch 'master' of https://github.com/oglen/oglen.net

Conflicts:
	client/writer/app/controllers/homeController.js
method