Have resolved conflicts
removed inline css
Merge branch 'master' of github.com:techvision/brails4
removed scaffold css & refactored level index page
Merge branch 'master' of github.com:techvision/brails4

Conflicts:
	app/views/levels/index.html.haml
added link for levels
Corrected the user factory
Merge branch 'master' of https://github.com/techvision/brails4
Added vender/files
removed calender_generator.min.js(regular js already there), renamed
bootstrap.js to bootstrap_brails.js as other bootstrap does not get
loaded, fixed bug in ACCDC API.
Removed vendor/unwanted files
added box in contents show page
Merge pull request #18 from rishijain/master

removed calender_generator.min.js(regular js already there), renamed
Merge branch 'master' of github.com:anujaware/brails4 into anujaware-master

Conflicts:
	app/views/levels/index.html.haml
Merge branch 'master' of github.com:techvision/brails4
added flat lab css, updated levels page
Merge pull request #19 from rishijain/master

added flat lab css, updated levels page
Merge branch 'master' of github.com:techvision/brails4

Conflicts:
	app/views/levels/index.html.haml
updated seed file for levels
Hve removed authority