small change
Merge branch 'master' of github.com:alexfaber2011/meteor-demo
Add more to our portfolio and style a bit more
Merge branch 'master' of github.com:alexfaber2011/meteor-demo
fix small merge conflict