moved more things around, added some caption
Merge branch 'master' of https://github.com/Vadskye/cs294-project