commarch, hackaton1 added to yaml
commarch report and presenation
fixed link to commarch
fixed link again
Link to curriculum assignment
solved merge conflicts
team prop 2
Merge branch 'master' of https://github.com/decause/hflossk
Merge branch 'master' of https://github.com/decause/hflossk
vid review
smoke test
Merge branch 'master' of https://github.com/decause/hflossk
vid review 2
Merge branch 'master' of https://github.com/decause/hflossk
Replaced tabs with spaces
Merge pull request #576 from jas2715/master

new pull request (?)