bugs
rebase
refactor, routing
drag bug fix- still hardcoded
drag refactor
Merge pull request #55 from alezucco/master

routing
Delete .DS_Store
Delete .DS_Store
Delete .DS_Store
Merge branch 'master' of https://github.com/AdFame/AdFame