storing for awhile
conflicts megerd
Merge branch 'master' of https://github.com/wetherbeei/SD2013-UIUC
words
improved lighting dic"