First working version of 3.2/butter

Also cleaned up the template folder a bit
Final version of butter

*  Sped up floyd-warshal to fit within time constraints... barely.