git ignore file update
Code formatting
Merge branch 'master' of https://github.com/Schosser/MasterLabProject09_2013
small changes in gitignore
removed unnecessary files/folders
Added timeline
remove old jquery version
Added mockups
Bugfix for old jquery version