JS bug
Posting
Committing conflict fixes
Merge pull request #12 from gafrong/master

airplane stores name: row: column:
Merge pull request #13 from gafrong/master

css updates
Conflict resolutions with Ji
More conflict resolutions
updated apps.js