fidling with bootstarp
commiting
reorganizing
Merge branch 'master' of https://github.com/luiscard91/2014FallWeb

Conflicts:
	playground/index.php