Kevin_Smarts/glife

Author	SHA1 Message	Date
Kevin_Smarts	616d8e9f72 Merge remote-tracking branch 'Lokplart/master'	4 days ago
f95Lok	19cad97e29 Merge remote-tracking branch 'kevin/master'	5 days ago