homepage basics
fixing conflicts
revised Gruntfile for working builds