Ignore node_modules
Added video functionality
Merge branch 'basic-styles'

Conflicts:
	app/index.html
	src/scss/partials/_main.scss
merged main.scss
Merge branch 'basic-styles'
Revert "Merge branch 'basic-styles'"

This reverts commit 0081f354eae063f2b1e2a82c032c2124d3052060, reversing
changes made to e9fc6ab520990c5538aa4de74c924012e28cc35f.
Revert "merged main.scss"

This reverts commit aa04d5a7c9fb222b6c764c5ae5b162a70d86b1c0.
Revert "Merge branch 'basic-styles'"

This reverts commit cfe57e6fddb07938a5dd0801ddb78b75663c8a8c, reversing
changes made to aa04d5a7c9fb222b6c764c5ae5b162a70d86b1c0.
test

test
Small tweaks
Fixes error in merge
Merge pull request #3 from websuperheroes/master

Merge basic styles into master