Merge branch 'master' of https://github.com/alialghamdi/prototype

Conflicts:
css/theme.css
Blah
Merge branch 'master' of https://github.com/alialghamdi/prototype