edited session
Merge branch 'master' of https://github.com/brandoshmando/seat-yourself
Merge branch 'master' of https://github.com/brandoshmando/seat-yourself
bs
merge conflict. removed seeds