init
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	public/js/directives.js
	views/index.jade
init