add transactions
update default
add hackathon4
fix links
Resolve conflict.