merged
subject allocation
link added
school event model added
fixes
initial commit
assets precompiled
assets changed
devise changes
seed changes
smarter skin css and js removed
conflicts removed
conflicts removed