deleted white space and added semicolons in js
deleted white space in app
deleted extraneous before_each
white space in specs
fixed merge conflicts and merged master
renamed a spec file
Merge branch 'master' into delete_white_space
Merge pull request #142 from LightningLord/delete_white_space

Delete white space