switching to add guard
live reload wod working with grunt
Merge branch 'grunt-live-reload'
working
Added nothing
Merge branch 'logout'

Conflicts:
	config/routes.rb
routes conflict resolved
layout updated
Merge branch 'logout'
Added Workspace model
Merge pull request #3 from aliirz/master

Pull Request # 3