begun work on splash page and fixed up some edit/noedit behaviors
Merge branch 'chris'
trying to get things to work again
fix update code and add pdf support
fix merge conflicts
fix Gemfile.lock conflict
Really fix Gemfile.lock conflicts
Commit to make sure nested attributes have the attr_accessible permission
Merge branch 'master' into chris
merging some changes
Fix table updates as well
Merge branch 'master' of https://github.com/gwillad/syllabest
readded editable condition and got editing working on Chrome
Merge branch 'chris'
finally figured out how to use CSS conditionally
a rough splash plage template
created sessions controller and moved splash/signin pages to sessions views
added files for previous commit
Non implemented sign-in changes - commiting so that I can pull latest