changed name to nick
commit on master
commit to master
Merge branch 'basics'