merged with dev branch
Finished all the demos
Merge with dev no-ff
Merged dev with master
Merged master with dev
Merged with dev
created getcomments.py
Finished display comments
Finished displaying comments
Added some TODOs