modified gitignore
add grunt changes
merged changes
corrected styles to fix problems