Added cd ..
cd by itself
Remove rack/piwik
Merge branch 'master' of github.com:davincicoders/2014-t1-ruby

Conflicts:
	101-git-practice/views/cd.html.erb
Homework for 102