Merge pull request #2 from htakahashi/Dustin

Dustin
Update the modal styles
Merge branch 'refs/heads/master' into HIRO

Conflicts:
	less/main.less
Merge pull request #3 from htakahashi/hiro

Hiro
Setting up testing for Module S
Merge branch 'refs/heads/master' into HIRO
Merge pull request #4 from htakahashi/hiro

Hiro
Setting up LESS structure.
Merge branch 'refs/heads/master' into HIRO