Merge pull request #4 from snakefooc/luis

changed less frmaework to sass in grunt
Revert "removed watch from default grunt task"

This reverts commit aabffb0861eedb77871a29021d1bf6576a7b50f2.
Revert aabffb0..7bd3420

This rolls back to commit aabffb0861eedb77871a29021d1bf6576a7b50f2.
Merge branch 'luis'
base compass

structure for compass
base style
Merge pull request #5 from mravinale/master

Merge pull request #1 from snakefooc/luis
Merge branch 'master' into luis
Merge branch 'luis'
Flat UI

Integrate module
fix skin delete files
Bootflat

Change skin
base skin
Merge branch 'luis'
Merge branch 'master' into luis
update compass

fix compass complie
Merge pull request #6 from snakefooc/luis

Change Compass and Base structure style
fixed sass integration using grunt processor
master branch will remain base app without example
* removed example app
Merge branch 'master' of https://github.com/MakingSense/meanp-seed

Conflicts:
	package.json