two mega noob programs to learn some stuff, yet all i've learned is that I dont do it right. :)
Merge remote-tracking branch 'origin/master'