initial commit, project scaffolded with angular-fullstack
fix README.md merge conflict
Merge pull request #1 from chrbradley/projectInit

Project init
add dummy project data
Merge pull request #2 from chrbradley/data

add dummy project data
(fix) fix path information in app.scss

Also includes compiled .css and .map files via SASS.
Merge pull request #3 from therobinkim/master

(fix) fix path information in app.scss
add script tags to index.html
removed test expression
Merge pull request #4 from mdaxtman/scriptTags

add script tags to index.html
add category route
Merge pull request #18 from chrbradley/category

add category route
add brand route
Merge pull request #19 from chrbradley/brand

add brand route
add item route
Merge pull request #20 from chrbradley/item

add item route
remove client/app/main/ directory
Merge pull request #21 from therobinkim/master

remove client/app/main/ directory
(wip) set up custom directives for main layout
Merge pull request #22 from therobinkim/mainTemplate

(wip) set up custom directives for main layout, Merged!!