Reverted deleted file
Renamed file
Merge branch 'master' of github.com:deepwinter/lattice