Merge pull request #93 from fiery-skippers-2014/fixing_bugs

Fixing bugs
made 0 student teacher link consistent, removed the link