Fix order for requiring the js.
Fix merge conflict.
Merge pull request #60 from cassiemoy/starter

Fix modals?