implemented rough version of code which constitutes a single step of optimization
Merge remote-tracking branch 'upstream/master'
added gitignore and cleaned up gitignored stuff