ashoka vid text
Merge branch 'master' of https://github.com/futureproject/futureproject.github.com

Conflicts: