fixing merge issues
new user tutorial
fixes merge conflict in app.less
Merge pull request #140 from taylorharwin/new-user-tutorial

New user tutorial