added bower and grunt
fix conflicts
Added bower and grunt