Merge pull request #60 from Sriii/master

master to sri
gallery
resources page
commit
Merge pull request #65 from Sriii/Sri's-branch

sri to master
Merge pull request #68 from Sriii/master

master to marc