Testing failing konacha specs on codeship
Add contributing info
Remove typos
Merge remote-tracking branch 'origin/welcome-page' into ember-specs
Get javascript to work on welcome page
Merge branch 'master' of https://github.com/andrewjadams3/Classwork into uploads
Set viewport: user-scaleable: no
Merge pull request #98 from andrewjadams3/uploads

Uploads
Update styling
Add JS tag
Finish homepage layout