fix merge conflict
[oweals/finalsclub.git] / public / javascripts / main2.js
2011-11-14 chapelfix merge conflict
2011-11-14 chapelRecent changes and alternatives