reverted code change
partial 1 html updated
partial 2 updated
commited stashed changes
updates in html
update in js file
remote changes
added changes in local
Merge remote-tracking branch 'origin/futureBranch2014' into futureBranch2014

Conflicts:
	HTML5Application/app/partials/partial1.html
ADDED VIEW 3
ADDED VIEW 4
Merge origin/futureBranch2014 into futureBranch2014

Conflicts:
	HTML5Application/app/js/app.js
Merge pull request #4 from dipak23b/futureBranch2014

Future branch2014