deleted orphaned merge conflict file
Update README.md
Update README.md
Update README.md
Update README.md
updates to grunt v0.4 and uses jasmine as test lib
Small updates and AMD/Node compatibility

* drops throwing errors for required arguments
* AMD/node compatibility
* automated versioning
* adds bowering
Update README.md
Update README.md
Update README.md
Merge branch 'master' of github.com:/creynders/dijon-framework

Conflicts:
	README.md