treaks
comments form
tweaks in groups
trying to merge krist's work
lastest changes by krist
Merge remote-tracking branch 'upstream/master'
adding krist's changes
trying to merge changes