Cleaned up app.js
Corrected tab spacing
Merge branch 'develop'