Trimmed template file
 new questions
Merge pull request #587 from abhinavc/master

New questions + change to question template