removed the content_access business
took off my sql socks.
Some are born with conflicts, some achieve conflicts, some have conflicts thrust upon 'em.
The fault, dear Brutus, lies not in our stars, but in our conflicts.
fixing commits Merge branch 'master' into UF-71
cleaned up drupal-org.make and skeletor.install
Lord what fools these conflicts be
created JSON view for individual projects
setting JSON view for individual projects
Though this be conflicts, there be yet method in't
The lady doth conflict too much, methinks.
We are such stuff as conflicts are made on
created JSON view for project profile
updated services to include project profile api
added fields to the project profile view
completed HTML for single Project Page
removed list bullets
created HTML Template for Individual Project
Some progress but not quite there...
Merge branch 'master' into UF-139