index buttons use funcs
Merge branch 'master' of https://github.com/GoldenLions/Artproject into useFuncs
Merge pull request #39 from myclamm/useFuncs

nav buttons use ng-click now
Merge branch 'master' of https://github.com/GoldenLions/Artproject into front-end

Conflicts:
	client/www/index.html
	client/www/scripts/controllers/mainController.js