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
Add help and info command line options
Merge branch 'master' of github.com:ablwr/LARDweb
Resolves merge conflict for new list method
suck it
fixed merge conflict