something is happening
fixed merge conflict on students.rb
Merge branch 'master' of github.com:ablwr/LARDweb
Merge branch 'master' of github.com:ablwr/LARDweb
Merge branch 'master' of github.com:ablwr/LARDweb
Merge branch 'master' of github.com:ablwr/LARDweb
suck it
fixed merge conflict