added some stuff
add more stuff
add stuff
Merge https://github.com/haveitjoewei/61hackathon